Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8388e3da authored by David S. Miller's avatar David S. Miller
Browse files

net: Set LL_MAX_HEADER properly for wireless. 



Wireless networking, particularly with MESH enabled, has
quite strong requirements for link-layer header space.

Based upon some numbers and descriptions from Johannes Berg
we use 96 (same as AX25) for plain wireless, and with
mesh enabled we use 128.

In the process, simplify the cpp conditional logic here by
ordering the cases by those needing the most space down
to those needing the least case.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f403ede7

include/linux/netdevice.h

+9 −7
Original line number Diff line number Diff line
@@ -93,14 +93,16 @@ struct wireless_dev; 
 *	used.

 */

 

#if !defined(CONFIG_AX25) && !defined(CONFIG_AX25_MODULE) && !defined(CONFIG_TR)

#define LL_MAX_HEADER	32

#if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

# if defined(CONFIG_MAC80211_MESH)

#  define LL_MAX_HEADER 128

# else

#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)

#  define LL_MAX_HEADER 96

#else

#define LL_MAX_HEADER	48

# endif

#elif defined(CONFIG_TR)

# define LL_MAX_HEADER 48

#else

# define LL_MAX_HEADER 32

#endif



#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \