patch-2.1.86 linux/net/ipv4/tcp_ipv4.c

Next file: linux/net/ipv4/tcp_output.c
Previous file: linux/net/ipv4/tcp_input.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.85/linux/net/ipv4/tcp_ipv4.c linux/net/ipv4/tcp_ipv4.c
@@ -629,7 +629,7 @@
 		 */
 		sk->daddr = 0;
 		sk->saddr = sk->rcv_saddr = 0;
-		kfree_skb(buff, FREE_WRITE);
+		kfree_skb(buff);
 		release_sock(sk);
 		return(-ENETUNREACH);
 	}
@@ -1057,7 +1057,7 @@
 
 	if(ip_build_pkt(skb, sk, req->af.v4_req.loc_addr,
 			req->af.v4_req.rmt_addr, req->af.v4_req.opt) < 0) {
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return;
 	}
 	
@@ -1538,7 +1538,7 @@
 reset:
 	tcp_v4_send_reset(skb);
 discard:
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	/* Be careful here. If this function gets more complicated and
 	 * gcc suffers from register pressure on the x86, sk (in %ebx) 
 	 * might be destroyed here. This current version compiles correctly,
@@ -1615,7 +1615,7 @@
 
 discard_it:
 	/* Discard frame. */
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
   	return 0;
 }
 
@@ -1814,11 +1814,11 @@
 
 	/* Cleanup up the write buffer. */
   	while((skb = skb_dequeue(&sk->write_queue)) != NULL)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 
 	/* Cleans up our, hopefuly empty, out_of_order_queue. */
   	while((skb = skb_dequeue(&sk->out_of_order_queue)) != NULL)
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 
 	return 0;
 }

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