2d02a4f5bd
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
24 lines
833 B
Diff
24 lines
833 B
Diff
From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001
|
|
From: Imre Kaloz <kaloz@openwrt.org>
|
|
Date: Fri, 7 Jul 2017 17:21:05 +0200
|
|
Subject: mac80211: increase wireless mesh header size
|
|
|
|
lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1
|
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|
---
|
|
include/linux/netdevice.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/include/linux/netdevice.h
|
|
+++ b/include/linux/netdevice.h
|
|
@@ -137,8 +137,8 @@ static inline bool dev_xmit_complete(int
|
|
|
|
#if defined(CONFIG_HYPERV_NET)
|
|
# define LL_MAX_HEADER 128
|
|
-#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
|
|
-# if defined(CONFIG_MAC80211_MESH)
|
|
+#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || 1
|
|
+# if defined(CONFIG_MAC80211_MESH) || 1
|
|
# define LL_MAX_HEADER 128
|
|
# else
|
|
# define LL_MAX_HEADER 96
|