summaryrefslogtreecommitdiff
path: root/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
diff options
context:
space:
mode:
authormirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-22 12:46:12 +0000
committermirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-22 12:46:12 +0000
commitc3fd35e7800ae1f2dd3fa42ade850c948e4b18ea (patch)
treef2e9f1150816b597adc38a4ca8a7a5f14a0909e5 /target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
parentf48e79cafe9d99bc741c905cb8328cc54cb75f6d (diff)
add generic patchset levelled up to 2.6.31-rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17351 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
new file mode 100644
index 0000000000..73e49a0ff3
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.31/940-wireless_mesh_header.patch
@@ -0,0 +1,22 @@
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -100,7 +100,7 @@ struct wireless_dev;
+ */
+
+ #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+-# if defined(CONFIG_MAC80211_MESH)
++# if 1 || defined(CONFIG_MAC80211_MESH)
+ # define LL_MAX_HEADER 128
+ # else
+ # define LL_MAX_HEADER 96
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -389,7 +389,7 @@ struct sk_buff {
+ #ifdef CONFIG_IPV6_NDISC_NODETYPE
+ __u8 ndisc_nodetype:2;
+ #endif
+-#if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
++#if 1
+ __u8 do_not_encrypt:1;
+ #endif
+ kmemcheck_bitfield_end(flags2);