patch-1.3.17 linux/net/ipv4/tcp.c

Next file: linux/net/ipx/Makefile
Previous file: linux/net/ipv4/route.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.16/linux/net/ipv4/tcp.c linux/net/ipv4/tcp.c
@@ -4964,7 +4964,7 @@
 		 *	Recover the buffer pointers
 		 */
 		 
-	    	iph = (struct iphdr *)(skb->data + skb->dev->hard_header_len);
+	    	iph = (struct iphdr *)skb->ip_hdr;
 	    	th = (struct tcphdr *)(((char *)iph) +(iph->ihl << 2));
 
 		/*
@@ -4973,7 +4973,7 @@
 		 
 	    	buff = sk->prot->wmalloc(sk, win_size + th->doff * 4 + 
 				     (iph->ihl << 2) +
-				     skb->dev->hard_header_len + 15, 
+				     sk->prot->max_header + 15, 
 				     1, GFP_ATOMIC);
 	    	if ( buff == NULL )
 	    		return;

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