diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-02 08:59:52 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-02 09:23:39 +0300 |
| commit | ed29668d1aa2c6f01e61dd616df13b5241cee7e0 (patch) | |
| tree | a086cf6311ed8623b292d3ea8d73c03f53207be0 /include/net | |
| parent | 65c959a39b7e9ad6b443b74904486b4a75b0232f (diff) | |
| parent | 3a99df9a3d14cd866b5516f8cba515a3bfd554ab (diff) | |
| download | linux-ed29668d1aa2c6f01e61dd616df13b5241cee7e0.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Smooth Cong Wang's bug fix into 'net-next'. Basically put
the bulk of the tcf_block_put() logic from 'net' into
tcf_block_put_ext(), but after the offload unbind.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tcp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index a2510cdef4b5..c2bf2a822b10 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1738,12 +1738,12 @@ static inline void tcp_highest_sack_reset(struct sock *sk) tcp_sk(sk)->highest_sack = skb ?: tcp_send_head(sk); } -/* Called when old skb is about to be deleted (to be combined with new skb) */ -static inline void tcp_highest_sack_combine(struct sock *sk, +/* Called when old skb is about to be deleted and replaced by new skb */ +static inline void tcp_highest_sack_replace(struct sock *sk, struct sk_buff *old, struct sk_buff *new) { - if (tcp_sk(sk)->sacked_out && (old == tcp_sk(sk)->highest_sack)) + if (old == tcp_highest_sack(sk)) tcp_sk(sk)->highest_sack = new; } |