1 files changed, 4 insertions, 3 deletions

diff --git a/include/net/tcp.h b/include/net/tcp.h
index b1ef98ebce53..e6d0002a1b0b 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -844,6 +844,7 @@ struct tcp_skb_cb {
                         __u32 key;
                         __u32 flags;
                         struct bpf_map *map;
+                        void *data_end;
                 } bpf;
         };
 };
@@ -1770,12 +1771,12 @@ static inline void tcp_highest_sack_reset(struct sock *sk)
         tcp_sk(sk)->highest_sack = tcp_write_queue_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;
 }