Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:43 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-17 06:38:50 +0200
commit510651760017b9739c09ddaa35bf8559f272e96a (patch)
tree8bc7e87c62cfe0938fbe06e523845546029fc8b3
parent863f23604920411f2053dafc5737fafcab7bb980 (diff)
vrf: sit mtu should not be updated when vrf netdev is the link
-rw-r--r--patches.kernel.org/5.1.3-028-vrf-sit-mtu-should-not-be-updated-when-vrf-netd.patch41
-rw-r--r--series.conf1
2 files changed, 42 insertions, 0 deletions
diff --git a/patches.kernel.org/5.1.3-028-vrf-sit-mtu-should-not-be-updated-when-vrf-netd.patch b/patches.kernel.org/5.1.3-028-vrf-sit-mtu-should-not-be-updated-when-vrf-netd.patch
new file mode 100644
index 0000000000..d28bb6a598
--- /dev/null
+++ b/patches.kernel.org/5.1.3-028-vrf-sit-mtu-should-not-be-updated-when-vrf-netd.patch
@@ -0,0 +1,41 @@
+From: Stephen Suryaputra <ssuryaextr@gmail.com>
+Date: Mon, 6 May 2019 15:00:01 -0400
+Subject: [PATCH] vrf: sit mtu should not be updated when vrf netdev is the
+ link
+References: bnc#1012628
+Patch-mainline: 5.1.3
+Git-commit: ff6ab32bd4e073976e4d8797b4d514a172cfe6cb
+
+[ 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>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ net/ipv6/sit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
+index b2109b74857d..971d60bf9640 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);
+--
+2.21.0
+
diff --git a/series.conf b/series.conf
index b4d11daafc..bf60185e90 100644
--- a/series.conf
+++ b/series.conf
@@ -113,6 +113,7 @@
patches.kernel.org/5.1.3-025-selinux-do-not-report-error-on-connect-AF_UNSPE.patch
patches.kernel.org/5.1.3-026-tipc-fix-hanging-clients-using-poll-with-EPOLLO.patch
patches.kernel.org/5.1.3-027-vlan-disable-SIOCSHWTSTAMP-in-container.patch
+ patches.kernel.org/5.1.3-028-vrf-sit-mtu-should-not-be-updated-when-vrf-netd.patch
########################################################
# Build fixes that apply to the vanilla kernel too.