diff options
Diffstat (limited to 'include/linux')
| -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 746901774d49..a3fb57fde623 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -93,14 +93,16 @@ struct wireless_dev; | |||
| 93 | * used. | 93 | * used. |
| 94 | */ | 94 | */ |
| 95 | 95 | ||
| 96 | #if !defined(CONFIG_AX25) && !defined(CONFIG_AX25_MODULE) && !defined(CONFIG_TR) | 96 | #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) |
| 97 | #define LL_MAX_HEADER 32 | 97 | # if defined(CONFIG_MAC80211_MESH) |
| 98 | # define LL_MAX_HEADER 128 | ||
| 99 | # else | ||
| 100 | # define LL_MAX_HEADER 96 | ||
| 101 | # endif | ||
| 102 | #elif defined(CONFIG_TR) | ||
| 103 | # define LL_MAX_HEADER 48 | ||
| 98 | #else | 104 | #else |
| 99 | #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) | 105 | # define LL_MAX_HEADER 32 |
| 100 | #define LL_MAX_HEADER 96 | ||
| 101 | #else | ||
| 102 | #define LL_MAX_HEADER 48 | ||
| 103 | #endif | ||
| 104 | #endif | 106 | #endif |
| 105 | 107 | ||
| 106 | #if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \ | 108 | #if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \ |