diff options
author | Eric Dumazet <edumazet@google.com> | 2017-08-31 16:48:21 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-01 20:22:03 -0700 |
commit | db5bce32fbe19f0c7482fb5a40a33178bbe7b11b (patch) | |
tree | da0171aec6a48e32f1c9c140cf04e984cd979f5c /net/ipv4 | |
parent | 487234cc1954a1c09115a82b45ebcc2086657572 (diff) | |
download | linux-db5bce32fbe19f0c7482fb5a40a33178bbe7b11b.tar.gz linux-db5bce32fbe19f0c7482fb5a40a33178bbe7b11b.tar.xz |
net: prepare (struct ubuf_info)->refcnt conversion
In order to convert this atomic_t refcnt to refcount_t,
we need to init the refcount to one to not trigger
a 0 -> 1 transition.
This also removes one atomic operation in fast path.
v2: removed dead code in sock_zerocopy_put_abort()
as suggested by Willem.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7a3d84375836..5091402720ab 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1190,8 +1190,6 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) goto out_err; } - /* skb may be freed in main loop, keep extra ref on uarg */ - sock_zerocopy_get(uarg); if (!(sk_check_csum_caps(sk) && sk->sk_route_caps & NETIF_F_SG)) uarg->zerocopy = 0; } |