diff options
| author | James Morris <james.morris@microsoft.com> | 2018-03-22 22:26:16 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-03-22 22:26:16 +0100 |
| commit | 5893ed18a26d1f56b97c0290b0cbbc2d49d6de28 (patch) | |
| tree | 97aa931519fca28a0a12fad7485347198f8267cc /net/xfrm/xfrm_device.c | |
| parent | exec: Set file unwritable before LSM check (diff) | |
| parent | Linux 4.16-rc6 (diff) | |
| download | linux-5893ed18a26d1f56b97c0290b0cbbc2d49d6de28.tar.xz linux-5893ed18a26d1f56b97c0290b0cbbc2d49d6de28.zip | |
Merge tag 'v4.16-rc6' into next-general
Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
Diffstat (limited to 'net/xfrm/xfrm_device.c')
| -rw-r--r-- | net/xfrm/xfrm_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_device.c b/net/xfrm/xfrm_device.c index 8e70291e586a..e87d6c4dd5b6 100644 --- a/net/xfrm/xfrm_device.c +++ b/net/xfrm/xfrm_device.c @@ -217,7 +217,7 @@ bool xfrm_dev_offload_ok(struct sk_buff *skb, struct xfrm_state *x) if (skb->len <= mtu) goto ok; - if (skb_is_gso(skb) && skb_gso_validate_mtu(skb, mtu)) + if (skb_is_gso(skb) && skb_gso_validate_network_len(skb, mtu)) goto ok; } |