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

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

diff -u --recursive --new-file v2.1.85/linux/net/ipv4/tcp_input.c linux/net/ipv4/tcp_input.c
@@ -763,7 +763,7 @@
 
 		skb_unlink(skb);
 		
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 	}
 
 	if (acked) {
@@ -1067,7 +1067,7 @@
 		if (!after(skb->end_seq, tp->rcv_nxt)) {
 			SOCK_DEBUG(sk, "ofo packet was already received \n");
 			skb_unlink(skb);
-			kfree_skb(skb, FREE_READ);
+			kfree_skb(skb);
 			continue;
 		}
 		SOCK_DEBUG(sk, "ofo requeuing : rcv_next %X seq %X - %X\n",
@@ -1106,7 +1106,7 @@
 		SOCK_DEBUG(sk, "retransmit received: seq %X\n", skb->seq);
 
 		tp->delayed_acks = MAX_DELAY_ACK;
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return;
 	}
 
@@ -1135,7 +1135,7 @@
 			if (skb->seq == skb1->seq && skb->len >= skb1->len) {
  				skb_append(skb1, skb);
  				skb_unlink(skb1);
- 				kfree_skb(skb1, FREE_READ);
+ 				kfree_skb(skb1);
 				break;
 			}
 			
@@ -1345,7 +1345,7 @@
 	 * useful packets (crossing fingers).
 	 */
 	while ((skb = skb_dequeue_tail(&sk->out_of_order_queue))) { 
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		if (atomic_read(&sk->rmem_alloc) <= sk->rcvbuf)
 			return;
 	}
@@ -1362,7 +1362,7 @@
 		}
 		skb_unlink(skb);
 		tp->rcv_nxt = skb->seq;
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		if (atomic_read(&sk->rmem_alloc) <= sk->rcvbuf) 
 			break;
 	}
@@ -1420,7 +1420,7 @@
 			/* Bulk data transfer: sender */
 			if (len == th->doff*4) {
 				tcp_ack(sk, th, skb->seq, skb->ack_seq, len); 
-				kfree_skb(skb, FREE_READ); 
+				kfree_skb(skb); 
 				tcp_data_snd_check(sk);
 				return 0;
 			} else { /* Header too small */
@@ -1504,7 +1504,7 @@
 
 	if (!queued) {
 	discard:
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 	}
 
 	return 0;
@@ -1929,7 +1929,7 @@
 
 	if (!queued) { 
 discard:
-		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