summaryrefslogtreecommitdiff
path: root/net/ipv4/ipvs/ip_vs_xmit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 15:29:23 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 15:29:23 -0700
commit804c64ea864d0a8ee13f3de0b74158a3e9c3166d (patch)
tree842b223e9db75ece9f4e2a5daf0f519b07b4a92a /net/ipv4/ipvs/ip_vs_xmit.c
parent49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff)
parentaa1c6a6f7f0518b42994d02756a41cbfdcac1916 (diff)
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_xmit.c')
-rw-r--r--net/ipv4/ipvs/ip_vs_xmit.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ipvs/ip_vs_xmit.c b/net/ipv4/ipvs/ip_vs_xmit.c
index faa6176bbeb1..de21da00057f 100644
--- a/net/ipv4/ipvs/ip_vs_xmit.c
+++ b/net/ipv4/ipvs/ip_vs_xmit.c
@@ -508,7 +508,6 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
rc = NF_ACCEPT;
/* do not touch skb anymore */
atomic_inc(&cp->in_pkts);
- __ip_vs_conn_put(cp);
goto out;
}