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

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

diff -u --recursive --new-file v2.1.85/linux/net/ipv4/ip_gre.c linux/net/ipv4/ip_gre.c
@@ -452,7 +452,7 @@
 
 	/* Try to guess incoming interface */
 	if (ip_route_output(&rt, eiph->saddr, 0, RT_TOS(eiph->tos), 0)) {
-		kfree_skb(skb2, FREE_WRITE);
+		kfree_skb(skb2);
 		return;
 	}
 	skb2->dev = rt->u.dst.dev;
@@ -464,14 +464,14 @@
 		if (ip_route_output(&rt, eiph->daddr, eiph->saddr, eiph->tos, 0) ||
 		    rt->u.dst.dev->type != ARPHRD_IPGRE) {
 			ip_rt_put(rt);
-			kfree_skb(skb2, FREE_WRITE);
+			kfree_skb(skb2);
 			return;
 		}
 	} else {
 		ip_rt_put(rt);
 		if (ip_route_input(skb2, eiph->daddr, eiph->saddr, eiph->tos, skb2->dev) ||
 		    skb2->dst->dev->type != ARPHRD_IPGRE) {
-			kfree_skb(skb2, FREE_WRITE);
+			kfree_skb(skb2);
 			return;
 		}
 	}
@@ -479,7 +479,7 @@
 	/* change mtu on this route */
 	if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
 		if (rel_info > skb2->dst->pmtu) {
-			kfree_skb(skb2, FREE_WRITE);
+			kfree_skb(skb2);
 			return;
 		}
 		skb2->dst->pmtu = rel_info;
@@ -493,7 +493,7 @@
 	}
 
 	icmp_send(skb2, rel_type, rel_code, rel_info);
-	kfree_skb(skb2, FREE_WRITE);
+	kfree_skb(skb2);
 #endif
 }
 
@@ -572,7 +572,7 @@
 	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PROT_UNREACH, 0);
 
 drop:
-	kfree_skb(skb, FREE_READ);
+	kfree_skb(skb);
 	return(0);
 }
 
@@ -723,11 +723,11 @@
 		if (!new_skb) {
 			ip_rt_put(rt);
   			stats->tx_dropped++;
-			dev_kfree_skb(skb, FREE_WRITE);
+			dev_kfree_skb(skb);
 			tunnel->recursion--;
 			return 0;
 		}
-		dev_kfree_skb(skb, FREE_WRITE);
+		dev_kfree_skb(skb);
 		skb = new_skb;
 	}
 
@@ -801,7 +801,7 @@
 
 tx_error:
 	stats->tx_errors++;
-	dev_kfree_skb(skb, FREE_WRITE);
+	dev_kfree_skb(skb);
 	tunnel->recursion--;
 	return 0;
 }

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