patch-2.4.23 linux-2.4.23/net/ipv6/sit.c

Next file: linux-2.4.23/net/ipv6/tcp_ipv6.c
Previous file: linux-2.4.23/net/ipv6/route.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/net/ipv6/sit.c linux-2.4.23/net/ipv6/sit.c
@@ -552,8 +552,6 @@
 			tunnel->err_count = 0;
 	}
 
-	skb->h.raw = skb->nh.raw;
-
 	/*
 	 * Okay, now see if we can stuff it in the buffer as-is.
 	 */
@@ -575,6 +573,7 @@
 		iph6 = skb->nh.ipv6h;
 	}
 
+	skb->h.raw = skb->nh.raw;
 	skb->nh.raw = skb_push(skb, sizeof(struct iphdr));
 	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
 	dst_release(skb->dst);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)