summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorStephen Suryaputra <ssuryaextr@gmail.com>2019-05-06 15:00:01 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-16 19:41:30 +0200
commit737713e6d83556cfb3605c07fd1cdb7521494e5e (patch)
treee037a8075c06d0403d790b50748b8f37c8d92afb /net/ipv6
parente38406070729de8a6c434cb9f1762100fd2f520d (diff)
downloadlinux-rpi3-737713e6d83556cfb3605c07fd1cdb7521494e5e.tar.gz
linux-rpi3-737713e6d83556cfb3605c07fd1cdb7521494e5e.tar.bz2
linux-rpi3-737713e6d83556cfb3605c07fd1cdb7521494e5e.zip
vrf: sit mtu should not be updated when vrf netdev is the link
[ Upstream commit ff6ab32bd4e073976e4d8797b4d514a172cfe6cb ] VRF netdev mtu isn't typically set and have an mtu of 65536. When the link of a tunnel is set, the tunnel mtu is changed from 1480 to the link mtu minus tunnel header. In the case of VRF netdev is the link, then the tunnel mtu becomes 65516. So, fix it by not setting the tunnel mtu in this case. Signed-off-by: Stephen Suryaputra <ssuryaextr@gmail.com> Reviewed-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/sit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 8f6cf8e6b5c1..41b3fe8ac3bc 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1084,7 +1084,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)
if (!tdev && tunnel->parms.link)
tdev = __dev_get_by_index(tunnel->net, tunnel->parms.link);
- if (tdev) {
+ if (tdev && !netif_is_l3_master(tdev)) {
int t_hlen = tunnel->hlen + sizeof(struct iphdr);
dev->hard_header_len = tdev->hard_header_len + sizeof(struct iphdr);