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

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

diff -u --recursive --new-file v2.1.85/linux/net/ipv4/ip_output.c linux/net/ipv4/ip_output.c
@@ -270,7 +270,7 @@
 		/* Multicasts with ttl 0 must not go beyond the host */
 
 		if (skb->nh.iph->ttl == 0) {
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return 0;
 		}
 	}
@@ -390,7 +390,7 @@
 		 * and if (uh...) TCP had segments queued on this route...
 		 */
 		skb2 = skb_realloc_headroom(skb, (dev->hard_header_len+15)&~15);
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		if (skb2 == NULL)
 			return;
 		skb = skb2;
@@ -432,7 +432,7 @@
 	return;
 
 drop:
-	kfree_skb(skb, FREE_WRITE);
+	kfree_skb(skb);
 }
 
 /*
@@ -539,7 +539,7 @@
 #ifdef CONFIG_NET_SECURITY
 		if ((fw_res=call_out_firewall(PF_SECURITY, NULL, NULL, (void *) 5, &skb))<FW_ACCEPT)
 		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			if (fw_res != FW_QUEUE)
 				return -EPERM;
 			else
@@ -549,7 +549,7 @@
 
 		if (err)
 		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return err;
 		}
 
@@ -716,7 +716,7 @@
 #endif		
 		if (err)
  		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			dev_unlock_list();
 			return err;
  		}
@@ -789,7 +789,7 @@
 
 	if (mtu<8) {
 		ip_statistics.IpFragFails++;
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return;
 	}
 
@@ -830,7 +830,7 @@
 		if ((skb2 = alloc_skb(len+hlen+dev->hard_header_len+15,GFP_ATOMIC)) == NULL) {
 			NETDEBUG(printk(KERN_INFO "IP: frag: no memory for new fragment!\n"));
 			ip_statistics.IpFragFails++;
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return;
 		}
 
@@ -903,7 +903,7 @@
 
 		output(skb2);
 	}
-	kfree_skb(skb, FREE_WRITE);
+	kfree_skb(skb);
 	ip_statistics.IpFragOKs++;
 }
 

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