diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-12 20:17:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-12 20:17:33 -0700 |
| commit | 8388e3da34edb141362bb42811ee487dfec15525 (patch) | |
| tree | 0d2eaece7f0eb72151d31276af0644bc913b5246 /include | |
| parent | f403ede70518c131ba8bebbacaf182927a58a315 (diff) | |
| download | linux-3.10-8388e3da34edb141362bb42811ee487dfec15525.tar.gz linux-3.10-8388e3da34edb141362bb42811ee487dfec15525.tar.bz2 linux-3.10-8388e3da34edb141362bb42811ee487dfec15525.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 746901774d4..a3fb57fde62 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -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 +# define LL_MAX_HEADER 96 +# endif +#elif defined(CONFIG_TR) +# define LL_MAX_HEADER 48 #else -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) -#define LL_MAX_HEADER 96 -#else -#define LL_MAX_HEADER 48 -#endif +# define LL_MAX_HEADER 32 #endif #if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \ |