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>

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;
 }