aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-08-15 22:12:17 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-08-15 22:12:17 +0000
commit82a092becec473a913a7e3e12281c6747041062c (patch)
tree2f1083fbd719b2564a73a37441d23320b0239e1e /target/linux/generic-2.6/patches-2.6.30
parentd8641e67e15569da9be03e5a25b1b1e82da09757 (diff)
downloadupstream-82a092becec473a913a7e3e12281c6747041062c.tar.gz
upstream-82a092becec473a913a7e3e12281c6747041062c.tar.bz2
upstream-82a092becec473a913a7e3e12281c6747041062c.zip
fix for commit r17276
SVN-Revision: 17280
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch
index 3f5c2dd477..202f998dde 100644
--- a/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/940-wireless_mesh_header.patch
@@ -9,3 +9,14 @@
# define LL_MAX_HEADER 128
# else
# define LL_MAX_HEADER 96
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -387,7 +387,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;
+ __u8 requeue:1;
+ #endif