diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-09 15:12:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-09 15:12:21 -0700 |
| commit | 5a10ececc60c469d0641531589ccc38a768e0d07 (patch) | |
| tree | 4c7b8918dbe2c4caacd120deffe2e8a8235d9561 /net/ipv4/tcp_minisocks.c | |
| parent | 8b58a39846568dcd7d0c98b2fadc25018e59dedf (diff) | |
| parent | dbe7faa4045ea83a37b691b12bb02a8f86c2d2e9 (diff) | |
Merge branch 'tw_cleanups'
Eric Dumazet says:
====================
inet: timewait cleanups
Another round of patches to make tw handling simpler.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_minisocks.c')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 4bc00cb79e60..6d8795b066ac 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -147,8 +147,7 @@ tcp_timewait_state_process(struct inet_timewait_sock *tw, struct sk_buff *skb, if (!th->fin || TCP_SKB_CB(skb)->end_seq != tcptw->tw_rcv_nxt + 1) { kill_with_rst: - inet_twsk_deschedule(tw); - inet_twsk_put(tw); + inet_twsk_deschedule_put(tw); return TCP_TW_RST; } @@ -198,8 +197,7 @@ kill_with_rst: */ if (sysctl_tcp_rfc1337 == 0) { kill: - inet_twsk_deschedule(tw); - inet_twsk_put(tw); + inet_twsk_deschedule_put(tw); return TCP_TW_SUCCESS; } } |