diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-02-09 16:20:52 +0800 |
commit | 054f8fe34189a62a0b87700c062a18c3a8421615 (patch) | |
tree | 805b9cc11d537a66870978b1ea51fc66c5a8f9a9 /net/ipv4/tcp.c | |
parent | 108df9c204f549150c7e1e3262ffd19bd624269e (diff) | |
parent | 53752ea210016b548cfc3898e6a5ea338fcb6c2c (diff) |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-17.03lsk-v3.18-17.02
Conflicts:
arch/x86/boot/compressed/misc.h
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 32b25cc96fff..a21c47289765 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -939,7 +939,7 @@ new_segment: i = skb_shinfo(skb)->nr_frags; can_coalesce = skb_can_coalesce(skb, i, page, offset); - if (!can_coalesce && i >= MAX_SKB_FRAGS) { + if (!can_coalesce && i >= sysctl_max_skb_frags) { tcp_mark_push(tp, skb); goto new_segment; } @@ -1225,7 +1225,7 @@ new_segment: if (!skb_can_coalesce(skb, i, pfrag->page, pfrag->offset)) { - if (i == MAX_SKB_FRAGS || !sg) { + if (i == sysctl_max_skb_frags || !sg) { tcp_mark_push(tp, skb); goto new_segment; } |