From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 30 May 2018 20:05:40 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v3.18.112~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09234832ac40f203cec875965a6359940174bd9e;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch
---

diff --git a/queue-4.14/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch b/queue-4.14/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch
new file mode 100644
index 00000000000..c2608e2ce52
--- /dev/null
+++ b/queue-4.14/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 <gregkh@linuxfoundation.org>
+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 <gregkh@linuxfoundation.org>
+
+This reverts commit 5815901c29c2936d7acbed2683d5807b4ae53ede 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 <astrachan@google.com>
+Cc: Stefano Brivio <sbrivio@redhat.com>
+Cc: Sabrina Dubroca <sd@queasysnail.net>
+Cc: Steffen Klassert <steffen.klassert@secunet.com>
+Cc: Sasha Levin <alexander.levin@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ipv4/ip_vti.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/net/ipv4/ip_vti.c
++++ b/net/ipv4/ip_vti.c
+@@ -396,6 +396,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.14/series b/queue-4.14/series
index a8f185155dc..783e58883fd 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -5,3 +5,4 @@ objtool-detect-rip-relative-switch-table-references-part-2.patch
 objtool-fix-noreturn-detection-for-recursive-sibling-calls.patch
 x86-mce-amd-carve-out-smca-get_block_address-code.patch
 x86-mce-amd-cache-smca-misc-block-addresses.patch
+revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch