diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-01 20:22:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-01 20:22:04 -0700 |
| commit | 250b0f78310c11b41b941f6ccd6938b5cf7970cd (patch) | |
| tree | 14ee9ec0f2e759bb237b2a010aa56989874cc054 /net/ipv4/tcp.c | |
| parent | 487234cc1954a1c09115a82b45ebcc2086657572 (diff) | |
| parent | c1d1b437816f0afa99202be3cb650c9d174667bc (diff) | |
Merge branch 'net-ubuf_info-refcnt-conversion'
Eric Dumazet says:
====================
net: ubuf_info.refcnt conversion
Yet another atomic_t -> refcount_t conversion, split in two patches.
First patch prepares the automatic conversion done in the second patch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -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; } |