diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2018-01-11 04:14:45 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-01-11 04:14:45 -0800 |
| commit | e525ef12a4ba7da1569592615fddf082c51b2f3e (patch) | |
| tree | 5733d8ac1a78313edf973cf0e265f0fefafd4308 /include/net/tcp.h | |
| parent | 1707cb3ff140dec01127669e1c88d5b850f272e4 (diff) | |
| parent | 80eb7ccae411759ac85501602aae882dede1c7fa (diff) | |
Merge "Merge android-4.4.104 (8bc4213) into msm-4.4"
Diffstat (limited to 'include/net/tcp.h')
| -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 52402ab90c57..340b01dd8c37 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1629,12 +1629,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; } |