aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-08-15 22:12:17 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-08-15 22:12:17 +0000
commitcfcaa409369b40ea500ba4a329d8781d71f336c5 (patch)
tree78690b50e7a7f9fe044aca9578c5b44085c495d2 /target/linux/generic-2.6/patches-2.6.30
parent5e234e853dabc584e68a7b8086a7de57988d558c (diff)
downloadupstream-cfcaa409369b40ea500ba4a329d8781d71f336c5.tar.gz
upstream-cfcaa409369b40ea500ba4a329d8781d71f336c5.tar.bz2
upstream-cfcaa409369b40ea500ba4a329d8781d71f336c5.zip
[mac80211] fix for commit r17276
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17280 3c298f89-4303-0410-b956-a3cf2f4a3e73
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