diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-03-10 17:16:56 -0800 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-10 17:16:56 -0800 |
commit | 1e8a3f0d2a1ef544611a7ea4a7c1512c732e0e43 (patch) | |
tree | 89b9a31da1a19af868424f4dac2178536cf30781 /net/xfrm/xfrm_interface.c | |
parent | 3e18bcb778e636045e091ddc09c2b69594bc844c (diff) | |
parent | 186d32bbf034417b40e2b4e773eeb8ef106c16c1 (diff) | |
download | linux-1e8a3f0d2a1ef544611a7ea4a7c1512c732e0e43.tar.gz linux-1e8a3f0d2a1ef544611a7ea4a7c1512c732e0e43.tar.bz2 linux-1e8a3f0d2a1ef544611a7ea4a7c1512c732e0e43.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/dsa/dsa2.c
commit afb3cc1a397d ("net: dsa: unlock the rtnl_mutex when dsa_master_setup() fails")
commit e83d56537859 ("net: dsa: replay master state events in dsa_tree_{setup,teardown}_master")
https://lore.kernel.org/all/20220307101436.7ae87da0@canb.auug.org.au/
drivers/net/ethernet/intel/ice/ice.h
commit 97b0129146b1 ("ice: Fix error with handling of bonding MTU")
commit 43113ff73453 ("ice: add TTY for GNSS module for E810T device")
https://lore.kernel.org/all/20220310112843.3233bcf1@canb.auug.org.au/
drivers/staging/gdm724x/gdm_lte.c
commit fc7f750dc9d1 ("staging: gdm724x: fix use after free in gdm_lte_rx()")
commit 4bcc4249b4cf ("staging: Use netif_rx().")
https://lore.kernel.org/all/20220308111043.1018a59d@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/xfrm/xfrm_interface.c')
-rw-r--r-- | net/xfrm/xfrm_interface.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index daec1fb08bf5..5113fa0fbcee 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -304,7 +304,10 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) if (mtu < IPV6_MIN_MTU) mtu = IPV6_MIN_MTU; - icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); + if (skb->len > 1280) + icmpv6_ndo_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu); + else + goto xmit; } else { if (!(ip_hdr(skb)->frag_off & htons(IP_DF))) goto xmit; |