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>
This commit is contained in:
parent
e912b1142b
commit
e51a67a9c8
@ -1243,7 +1243,6 @@ int ip_push_pending_frames(struct sock *sk)
|
|||||||
skb->len += tmp_skb->len;
|
skb->len += tmp_skb->len;
|
||||||
skb->data_len += tmp_skb->len;
|
skb->data_len += tmp_skb->len;
|
||||||
skb->truesize += tmp_skb->truesize;
|
skb->truesize += tmp_skb->truesize;
|
||||||
__sock_put(tmp_skb->sk);
|
|
||||||
tmp_skb->destructor = NULL;
|
tmp_skb->destructor = NULL;
|
||||||
tmp_skb->sk = NULL;
|
tmp_skb->sk = NULL;
|
||||||
}
|
}
|
||||||
|
@ -1484,7 +1484,6 @@ int ip6_push_pending_frames(struct sock *sk)
|
|||||||
skb->len += tmp_skb->len;
|
skb->len += tmp_skb->len;
|
||||||
skb->data_len += tmp_skb->len;
|
skb->data_len += tmp_skb->len;
|
||||||
skb->truesize += tmp_skb->truesize;
|
skb->truesize += tmp_skb->truesize;
|
||||||
__sock_put(tmp_skb->sk);
|
|
||||||
tmp_skb->destructor = NULL;
|
tmp_skb->destructor = NULL;
|
||||||
tmp_skb->sk = NULL;
|
tmp_skb->sk = NULL;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user