From 9f210ba621edddaf7edf8da132ecde7e0ee11bc2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 May 2018 21:52:59 +0200 Subject: [PATCH] 4.4-stable patches added patches: revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch --- ...passed-on-link-creation-via-ifla_mtu.patch | 39 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-4.4/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch diff --git a/queue-4.4/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch b/queue-4.4/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch new file mode 100644 index 00000000000..0c419373140 --- /dev/null +++ b/queue-4.4/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch @@ -0,0 +1,39 @@ +From cb3afe1f1187bba5801dafadd9974bfbe3b9ff7a Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Wed, 30 May 2018 20:44:08 +0200 +Subject: Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU" + +From: Greg Kroah-Hartman + +This reverts commit 33cebc976c3b77bdf8f3fb4478cf776131ebfe4f which is +03080e5ec727 ("vti4: Don't override MTU passed on link creation via +IFLA_MTU") upstream as it causes test failures. + +This commit should not have been backported to anything older than 4.16, +despite what the changelog said as the mtu must be set in older kernels, +unlike is needed in 4.16 and newer. + +Thanks to Alistair Strachan for the debugging help figuring this out, +and for 'git bisect' for making my life a whole lot easier. + +Cc: Alistair Strachan +Cc: Stefano Brivio +Cc: Sabrina Dubroca +Cc: Steffen Klassert +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman + +--- + net/ipv4/ip_vti.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/ipv4/ip_vti.c ++++ b/net/ipv4/ip_vti.c +@@ -366,6 +366,7 @@ static int vti_tunnel_init(struct net_de + memcpy(dev->dev_addr, &iph->saddr, 4); + memcpy(dev->broadcast, &iph->daddr, 4); + ++ dev->mtu = ETH_DATA_LEN; + dev->flags = IFF_NOARP; + dev->addr_len = 4; + dev->features |= NETIF_F_LLTX; diff --git a/queue-4.4/series b/queue-4.4/series index 0214ed48b93..2fccf756c6d 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -2,3 +2,4 @@ arm64-lse-add-early-clobbers-to-some-input-output-asm-operands.patch powerpc-64s-clear-pcr-on-boot.patch usb-serial-cp210x-use-tcflag_t-to-fix-incompatible-pointer-type.patch sh-new-gcc-support.patch +revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch -- 2.47.3