patch-2.1.36 linux/net/core/dev.c

Next file: linux/net/core/dst.c
Previous file: linux/net/bridge/br.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.35/linux/net/core/dev.c linux/net/core/dev.c
@@ -79,6 +79,7 @@
 #include <linux/stat.h>
 #include <net/br.h>
 #include <linux/net_alias.h>
+#include <linux/init.h>
 #ifdef CONFIG_KERNELD
 #include <linux/kerneld.h>
 #endif
@@ -122,7 +123,7 @@
  *	Device list lock
  */
  
-atomic_t dev_lockct = ATOMIC_INIT;
+atomic_t dev_lockct = ATOMIC_INIT(0);
  
 /*
  *	Our notifier list
@@ -479,10 +480,6 @@
 				/* at the front or the back of the	*/
 				/* queue - front is a retransmit try	*/
 
-#if CONFIG_SKB_CHECK 
-	IS_SKB(skb);
-#endif    
-
 	/*
 	 *	Negative priority is used to flag a frame that is being pulled from the
 	 *	queue front as a retransmit attempt. It therefore goes back on the queue
@@ -576,10 +573,6 @@
 
 	start_bh_atomic();
 
-#if CONFIG_SKB_CHECK 
-	IS_SKB(skb);
-#endif    
-
 	/*
 	 *	If the address has not been resolved. Call the device header rebuilder.
 	 *	This can cover all protocols and technically not just ARP either.
@@ -676,9 +669,7 @@
 	/*
 	 *	Add it to the "backlog" queue. 
 	 */
-#if CONFIG_SKB_CHECK
-	IS_SKB(skb);
-#endif	
+
 	skb_queue_tail(&backlog,skb);
 	backlog_size++;
   
@@ -1578,7 +1569,7 @@
 #endif	/* CONFIG_PROC_FS */
 #endif	/* CONFIG_NET_RADIO */
 
-int net_dev_init(void)
+__initfunc(int net_dev_init(void))
 {
 	struct device *dev, **dp;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov