diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-12-03 11:14:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-05 13:32:24 -0500 |
| commit | 7aa5470c2c09265902b5e4289afa82e4e7c2987e (patch) | |
| tree | acd4d2976939d6de5f4495bbebc4a9420e40d38e /net/ipv4/tcp.c | |
| parent | 9115e8cd2a0c6eaaa900c462721f12e1d45f326c (diff) | |
| download | linux-7aa5470c2c09265902b5e4289afa82e4e7c2987e.tar.gz linux-7aa5470c2c09265902b5e4289afa82e4e7c2987e.tar.xz | |
tcp: tsq: move tsq_flags close to sk_wmem_alloc
tsq_flags being in the same cache line than sk_wmem_alloc
makes a lot of sense. Both fields are changed from tcp_wfree()
and more generally by various TSQ related functions.
Prior patch made room in struct sock and added sk_tsq_flags,
this patch deletes tsq_flags from struct tcp_sock.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 1149b48700a1..1ef3165114ba 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -663,9 +663,9 @@ static void tcp_push(struct sock *sk, int flags, int mss_now, if (tcp_should_autocork(sk, skb, size_goal)) { /* avoid atomic op if TSQ_THROTTLED bit is already set */ - if (!test_bit(TSQ_THROTTLED, &tp->tsq_flags)) { + if (!test_bit(TSQ_THROTTLED, &sk->sk_tsq_flags)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPAUTOCORKING); - set_bit(TSQ_THROTTLED, &tp->tsq_flags); + set_bit(TSQ_THROTTLED, &sk->sk_tsq_flags); } /* It is possible TX completion already happened * before we set TSQ_THROTTLED. |