74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
29 lines
956 B
Diff
29 lines
956 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(-)
|
|
|
|
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
|
|
index 780e7171f548..6e0f2c79f79a 100644
|
|
--- a/include/linux/netdevice.h
|
|
+++ b/include/linux/netdevice.h
|
|
@@ -137,8 +137,8 @@ static inline bool dev_xmit_complete(int rc)
|
|
|
|
#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
|
|
--
|
|
2.11.0
|
|
|