diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 05:11:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 05:11:22 -0400 |
| commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
| tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /net/ipv4/tcp_input.c | |
| parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
| parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 40661fc1e233..b5c23756965a 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -1162,7 +1162,7 @@ static int tcp_match_skb_to_sack(struct sock *sk, struct sk_buff *skb, | |||
| 1162 | unsigned int new_len = (pkt_len / mss) * mss; | 1162 | unsigned int new_len = (pkt_len / mss) * mss; |
| 1163 | if (!in_sack && new_len < pkt_len) { | 1163 | if (!in_sack && new_len < pkt_len) { |
| 1164 | new_len += mss; | 1164 | new_len += mss; |
| 1165 | if (new_len > skb->len) | 1165 | if (new_len >= skb->len) |
| 1166 | return 0; | 1166 | return 0; |
| 1167 | } | 1167 | } |
| 1168 | pkt_len = new_len; | 1168 | pkt_len = new_len; |