# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1141  -> 1.1142 
#	net/ipv4/ipvs/ip_vs_conn.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/01	wensong@xxxxxxxxxxxx	1.1142
# [IPVS] Fix ip_vs_tunnel_xmit to return NF_DROP when no memory available
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
--- a/net/ipv4/ipvs/ip_vs_conn.c	Wed Oct  1 19:54:02 2003
+++ b/net/ipv4/ipvs/ip_vs_conn.c	Wed Oct  1 19:54:02 2003
@@ -903,9 +903,8 @@
 			skb_realloc_headroom(skb, max_headroom);
 		if (!new_skb) {
 			ip_rt_put(rt);
-			kfree_skb(skb);
 			IP_VS_ERR_RL("ip_vs_tunnel_xmit(): no memory\n");
-			return -EINVAL;
+			return NF_DROP;
 		}
 		kfree_skb(skb);
 		skb = new_skb;