diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2018-08-30 21:18:17 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-08-30 21:18:17 +0100 |
| commit | 2ad2d9ee7a174695b6b69ff2dbbf4705eadf1c94 (patch) | |
| tree | 740946966eac14622cdc1dcdb42beadc9e58626e | |
| parent | 7b471797cedb5d4ea1718ad37f79b9bb3fa4c330 (diff) | |
| download | linux-stable-queue-2ad2d9ee7a174695b6b69ff2dbbf4705eadf1c94.tar.gz | |
Revert an incorrect change to vti4
| -rw-r--r-- | queue-3.16/revert-vti4-don-t-override-mtu-passed-on-link-creati.patch | 27 | ||||
| -rw-r--r-- | queue-3.16/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/queue-3.16/revert-vti4-don-t-override-mtu-passed-on-link-creati.patch b/queue-3.16/revert-vti4-don-t-override-mtu-passed-on-link-creati.patch new file mode 100644 index 00000000..00b42a0e --- /dev/null +++ b/queue-3.16/revert-vti4-don-t-override-mtu-passed-on-link-creati.patch @@ -0,0 +1,27 @@ +From: Ben Hutchings <ben@decadent.org.uk> +Date: Tue, 10 Jul 2018 20:07:08 +0100 +Subject: Revert "vti4: Don't override MTU passed on link creation via IFLA_MTU" + +This reverts commit 5a79e43ffa5014c020e0d0f4e383205f87b10111, which +was commit 03080e5ec72740c1a62e6730f2a5f3f114f11b19 upstream, as it +causes test failures. It should not have been backported to anything +older than 4.16. Thanks to Alistair Strachan for debugging this. + +Cc: Alistair Strachan <astrachan@google.com> +Signed-off-by: Ben Hutchings <ben@decadent.org.uk> +--- + net/ipv4/ip_vti.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c +index b4fc9e710308..778ee1bf40ad 100644 +--- a/net/ipv4/ip_vti.c ++++ b/net/ipv4/ip_vti.c +@@ -359,6 +359,7 @@ static int vti_tunnel_init(struct net_device *dev) + 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; diff --git a/queue-3.16/series b/queue-3.16/series index 684f1c6c..fa0fcde2 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -1,2 +1,3 @@ x86-fpu-fix-the-nofxsr-boot-parameter-to-also-clear.patch x86-fpu-default-eagerfpu-if-fpu-and-fxsr-are-enabled.patch +revert-vti4-don-t-override-mtu-passed-on-link-creati.patch |