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

• Lines: 117
• Date: Tue Feb 10 12:24:34 1998
• Orig file: v2.1.85/linux/net/ipv4/ipmr.c
• Orig date: Mon Jan 12 15:28:28 1998

diff -u --recursive --new-file v2.1.85/linux/net/ipv4/ipmr.c linux/net/ipv4/ipmr.c
@@ -135,7 +135,7 @@
 static int reg_vif_xmit(struct sk_buff *skb, struct device *dev)
 {
 	ipmr_cache_report(skb, reg_vif_num, IGMPMSG_WHOLEPKT);
-	kfree_skb(skb, FREE_WRITE);
+	kfree_skb(skb);
 	return 0;
 }
 
@@ -320,7 +320,7 @@
 				netlink_unicast(rtnl, skb, NETLINK_CB(skb).pid, MSG_DONTWAIT);
 			} else
 #endif
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 		}
 	}
 	kfree_s(cache,sizeof(cache));
@@ -504,7 +504,7 @@
 	if ((ret=sock_queue_rcv_skb(mroute_socket,skb))<0) {
 		if (net_ratelimit())
 			printk(KERN_WARNING "mroute: pending queue full, dropping entries.\n");
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 	}
 
 	return ret;
@@ -523,7 +523,7 @@
 		 */
 		if(cache_resolve_queue_len>=10 || (cache=ipmr_cache_alloc(GFP_ATOMIC))==NULL)
 		{
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return -ENOBUFS;
 		}
 		/*
@@ -556,7 +556,7 @@
 			 */
 			if (ipmr_cache_report(skb, vifi, IGMPMSG_NOCACHE)<0) {
 				ipmr_cache_delete(cache);
-				kfree_skb(skb, FREE_WRITE);
+				kfree_skb(skb);
 				return -ENOBUFS;
 			}
 		}
@@ -566,7 +566,7 @@
 	 */
 	if(cache->mfc_queuelen>3)
 	{
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return -ENOBUFS;
 	}
 	cache->mfc_queuelen++;
@@ -1176,7 +1176,7 @@
 
 dont_forward:
 	if (!local)
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 	return 0;
 }
 
@@ -1234,7 +1234,7 @@
 			ipmr_cache_unresolved(cache, vif, skb);
 			return -EAGAIN;
 		}
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return 0;
 	}
 
@@ -1247,7 +1247,7 @@
 dont_forward:
 	if (local)
 		return ip_local_deliver(skb);
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	return 0;
 }
 
@@ -1265,7 +1265,7 @@
 	    len < sizeof(*pim) + sizeof(*encap) ||
 	    pim->group != PIM_V1_VERSION || pim->code != PIM_V1_REGISTER ||
 	    reg_dev == NULL) {
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
                 return -EINVAL;
         }
 
@@ -1279,7 +1279,7 @@
 	if (!MULTICAST(encap->daddr) ||
 	    ntohs(encap->tot_len) == 0 ||
 	    ntohs(encap->tot_len) + sizeof(*pim) > len) {
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return -EINVAL;
 	}
 	skb->mac.raw = skb->nh.raw;
@@ -1310,7 +1310,7 @@
 	    (pim->flags&PIM_NULL_REGISTER) ||
 	    reg_dev == NULL ||
 	    ip_compute_csum((void *)pim, len)) {
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
                 return -EINVAL;
         }
 
@@ -1319,7 +1319,7 @@
 	if (!MULTICAST(encap->daddr) ||
 	    ntohs(encap->tot_len) == 0 ||
 	    ntohs(encap->tot_len) + sizeof(*pim) > len) {
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		return -EINVAL;
 	}
 	skb->mac.raw = skb->nh.raw;