summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-16 08:15:47 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-16 08:15:47 +0000
commit27b61d459838cf692e5885234bcc7477a7ac4452 (patch)
tree06327ef2f2e0aae7d0d6d40c293c66d61c812e78 /target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
parent99cbbb372c592181737c943416760875763d1c7c (diff)
generic-2.6: sync patches to 2.6.33.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20236 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
index 421ed8b02..a2b82d86a 100644
--- a/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
@@ -1,9 +1,9 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
+@@ -137,7 +137,7 @@
*/
- #if defined(CONFIG_WLAN_80211) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+ #if defined(CONFIG_WLAN) || defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-# if defined(CONFIG_MAC80211_MESH)
+# if 1 || defined(CONFIG_MAC80211_MESH)
# define LL_MAX_HEADER 128