Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e51a67a9 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: ip_push_pending_frames() fix 



After commit 2b85a34e
(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: default avatarEmil S Tantilov <emils.tantilov@gmail.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Tested-by: default avatarEmil S Tantilov <emils.tantilov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e912b114

net/ipv4/ip_output.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

net/ipv6/ip6_output.c

+0 −1
Original line number Diff line number Diff line
@@ -1484,7 +1484,6 @@ int ip6_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;

	}