Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-06-11 11:03:40 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-06-11 11:03:40 +0200
commitfcc0c04b7802d0dace5f6b1e93f698de2a9f65d7 (patch)
tree652871d336e430c6292a53a899b733b241d56f49
parent3f6a48aade30527cbffa00da5c4359fc8d871c67 (diff)
parent52c6a0b0c92828c67ff5d491bb541b899e5b902d (diff)
Merge branch 'users/mkubecek/SLE15/1137586' into SLE15_EMBARGO
Pull networking fixes from Michal Kubecek suse-commit: c5d8d78909606a3e1137163ddc75d3dc9a2e7d7f
-rw-r--r--net/ipv4/tcp_input.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 85119df5bbbf..75a2b0a665ac 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1419,6 +1419,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *prev;
int mss;
+ int next_pcount;
int pcount = 0;
int len;
int in_sack;
@@ -1535,9 +1536,11 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
goto out;
len = skb->len;
- pcount = tcp_skb_pcount(skb);
- if (tcp_skb_shift(prev, skb, pcount, len))
- tcp_shifted_skb(sk, skb, state, pcount, len, mss, 0);
+ next_pcount = tcp_skb_pcount(skb);
+ if (tcp_skb_shift(prev, skb, next_pcount, len)) {
+ pcount += next_pcount;
+ tcp_shifted_skb(sk, skb, state, next_pcount, len, mss, 0);
+ }
out:
state->fack_count += pcount;