ar71xx: fix NULL pointer dereference in the ethernet driver
[openwrt.git] / target / linux / generic-2.6 / patches-2.6.31 / 940-wireless_mesh_header.patch
1 --- a/include/linux/netdevice.h
2 +++ b/include/linux/netdevice.h
3 @@ -100,7 +100,7 @@ struct wireless_dev;
4 */
5
6 #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
7 -# if defined(CONFIG_MAC80211_MESH)
8 +# if 1 || defined(CONFIG_MAC80211_MESH)
9 # define LL_MAX_HEADER 128
10 # else
11 # define LL_MAX_HEADER 96
12 --- a/include/linux/skbuff.h
13 +++ b/include/linux/skbuff.h
14 @@ -389,7 +389,7 @@ struct sk_buff {
15 #ifdef CONFIG_IPV6_NDISC_NODETYPE
16 __u8 ndisc_nodetype:2;
17 #endif
18 -#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
19 +#if 1
20 __u8 do_not_encrypt:1;
21 #endif
22 kmemcheck_bitfield_end(flags2);
This page took 0.049715 seconds and 5 git commands to generate.