diff options
author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:02 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:02 -0400 |
commit | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (patch) | |
tree | 7f67a4c38456ec73359d576a5c602d18c3c3ef72 /net/ipv4/ipvs/ip_vs_xmit.c | |
parent | fff9cfd99c0f88645c3f50d7476d6c8cef99f140 (diff) | |
parent | 254feb882a7c6e4e51416dff6a97d847fbbba551 (diff) | |
download | op-kernel-dev-1f15d694522af9cd7492695f11dd2dc77b6cf098.zip op-kernel-dev-1f15d694522af9cd7492695f11dd2dc77b6cf098.tar.gz |
Automatic merge of /spare/repo/netdev-2.6 branch master
Diffstat (limited to 'net/ipv4/ipvs/ip_vs_xmit.c')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_xmit.c | 1 |
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 faa6176..de21da0 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; } |