kernel: Make the patches apply on top of 4.19
[openwrt/staging/chunkeey.git] / target / linux / generic / hack-4.19 / 651-wireless_mesh_header.patch
1 From 6d3bc769657b0ee7c7506dad9911111c4226a7ea Mon Sep 17 00:00:00 2001
2 From: Imre Kaloz <kaloz@openwrt.org>
3 Date: Fri, 7 Jul 2017 17:21:05 +0200
4 Subject: mac80211: increase wireless mesh header size
5
6 lede-commit 3d4466cfd8f75f717efdb1f96fdde3c70d865fc1
7 Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
8 ---
9 include/linux/netdevice.h | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12 --- a/include/linux/netdevice.h
13 +++ b/include/linux/netdevice.h
14 @@ -140,8 +140,8 @@ static inline bool dev_xmit_complete(int
15
16 #if defined(CONFIG_HYPERV_NET)
17 # define LL_MAX_HEADER 128
18 -#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
19 -# if defined(CONFIG_MAC80211_MESH)
20 +#elif defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25) || 1
21 +# if defined(CONFIG_MAC80211_MESH) || 1
22 # define LL_MAX_HEADER 128
23 # else
24 # define LL_MAX_HEADER 96