diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-09 07:32:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-09 07:32:20 +0100 |
| commit | fc4c5a3828bdba157f8ea406e1f4ceb75c13039c (patch) | |
| tree | e3fc4601f914fa59e70c7534206cf5c2c6ba16d1 /net/ipv6/xfrm6_output.c | |
| parent | 14a7405b2e814221a951bd7a76ce4a8d24c1b3be (diff) | |
| parent | 1b88accf6a659c46d5c8e68912896f112bf882bb (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/xfrm6_output.c')
| -rw-r--r-- | net/ipv6/xfrm6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index 8ae87d4ec5ff..5959ce9620eb 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c @@ -82,7 +82,7 @@ static int xfrm6_tunnel_check_size(struct sk_buff *skb) if ((!skb_is_gso(skb) && skb->len > mtu) || (skb_is_gso(skb) && - skb_gso_network_seglen(skb) > ip6_skb_dst_mtu(skb))) { + !skb_gso_validate_network_len(skb, ip6_skb_dst_mtu(skb)))) { skb->dev = dst->dev; skb->protocol = htons(ETH_P_IPV6); |