summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-07-08 14:20:42 +0000
committerDavid S. Miller <davem@davemloft.net>2009-07-11 20:26:21 -0700
commite51a67a9c8a2ea5c563f8c2ba6613fe2100ffe67 (patch)
treed9741a14cc9134e592c37b1c235f2f13a20c261f /net/ipv4
parente912b1142be8f1e2c71c71001dc992c6e5eb2ec1 (diff)
downloadblackbird-op-linux-e51a67a9c8a2ea5c563f8c2ba6613fe2100ffe67.tar.gz
blackbird-op-linux-e51a67a9c8a2ea5c563f8c2ba6613fe2100ffe67.zip
net: ip_push_pending_frames() fix
After commit 2b85a34e911bf483c27cfdd124aeb1605145dc80 (net: No more expensive sock_hold()/sock_put() on each tx) we do not take any more references on sk->sk_refcnt on outgoing packets. I forgot to delete two __sock_put() from ip_push_pending_frames() and ip6_push_pending_frames(). Reported-by: Emil S Tantilov <emils.tantilov@gmail.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Tested-by: Emil S Tantilov <emils.tantilov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_output.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 247026282669..7d0821054729 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1243,7 +1243,6 @@ int ip_push_pending_frames(struct sock *sk)
skb->len += tmp_skb->len;
skb->data_len += tmp_skb->len;
skb->truesize += tmp_skb->truesize;
- __sock_put(tmp_skb->sk);
tmp_skb->destructor = NULL;
tmp_skb->sk = NULL;
}
OpenPOWER on IntegriCloud