]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.18-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 May 2018 19:55:16 +0000 (21:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 May 2018 19:55:16 +0000 (21:55 +0200)
added patches:
revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch

queue-3.18/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch [new file with mode: 0644]
queue-3.18/series

diff --git a/queue-3.18/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch b/queue-3.18/revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch
new file mode 100644 (file)
index 0000000..5f07a2a
--- /dev/null
@@ -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 08a049c84408dfd0240a3340681486779c167cc8 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
+@@ -365,6 +365,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->iflink             = 0;
+       dev->addr_len           = 4;
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5892b1b2def47ac1422840ae55b93bbfbf807b27 100644 (file)
@@ -0,0 +1 @@
+revert-vti4-don-t-override-mtu-passed-on-link-creation-via-ifla_mtu.patch