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

Next file: linux/net/core/skbuff.c
Previous file: linux/net/ax25/ax25_subr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.6/linux/net/core/dev.c linux/net/core/dev.c
@@ -93,7 +93,7 @@
 static struct sk_buff_head backlog = 
 {
 	(struct sk_buff *)&backlog, (struct sk_buff *)&backlog
-#ifdef CONFIG_SKB_CHECK
+#if CONFIG_SKB_CHECK
 	,SK_HEAD_SKB
 #endif
 };
@@ -320,7 +320,7 @@
 
 	if(pri>=0 && !skb_device_locked(skb))
 		skb_device_lock(skb);	/* Shove a lock on the frame */
-#ifdef CONFIG_SKB_CHECK 
+#if CONFIG_SKB_CHECK 
 	IS_SKB(skb);
 #endif    
 	skb->dev = dev;
@@ -444,7 +444,7 @@
 	/*
 	 *	Add it to the "backlog" queue. 
 	 */
-#ifdef CONFIG_SKB_CHECK
+#if CONFIG_SKB_CHECK
 	IS_SKB(skb);
 #endif	
 	skb_queue_tail(&backlog,skb);
@@ -647,7 +647,7 @@
 		*	skb->h.raw point to the MAC and encapsulated data
 		*/
 
-		skb->h.raw = skb->data+skb->dev->hard_header_len;
+		skb->h.raw = skb->data;
 
 	       /*
 		* 	Fetch the packet protocol ID. 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this