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

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

diff -u --recursive --new-file v2.1.85/linux/net/ipv4/udp.c linux/net/ipv4/udp.c
@@ -492,7 +492,7 @@
 	if (sk->ip_recverr && !sk->sock_readers) {
 		struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
 		if (skb2 && sock_queue_err_skb(sk, skb2))
-			kfree_skb(skb2, FREE_READ);
+			kfree_skb(skb2);
 	}
   	
 	switch (type) {
@@ -971,7 +971,7 @@
 	 
 	if(!ipsec_sk_policy(sk,skb))
 	{	
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return(0);
 	}
 	 
@@ -983,7 +983,7 @@
 		udp_statistics.UdpInErrors++;
 		ip_statistics.IpInDiscards++;
 		ip_statistics.IpInDelivers--;
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return -1;
 	}
 	udp_statistics.UdpInDatagrams++;
@@ -1031,7 +1031,7 @@
 	}
 	SOCKHASH_UNLOCK();
 	if(!given)
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 	return 0;
 }
 
@@ -1094,7 +1094,7 @@
 	if (ulen > len || len < sizeof(*uh) || ulen < sizeof(*uh)) {
 		NETDEBUG(printk(KERN_DEBUG "UDP: short packet: %d/%d\n", ulen, len));
 		udp_statistics.UdpInErrors++;
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return(0);
 	}
 
@@ -1113,7 +1113,7 @@
 		       ntohl(daddr),ntohs(uh->dest),
 		       ulen));
 		udp_statistics.UdpInErrors++;
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return(0);
 	}
 
@@ -1149,7 +1149,7 @@
 		 * Hmm.  We got an UDP broadcast to a port to which we
 		 * don't wanna listen.  Ignore it.
 		 */
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return(0);
   	}
 	udp_deliver(sk, skb);

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