From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 15 Aug 2009 22:12:17 +0000 (+0000)
Subject: [mac80211] fix for commit r17276
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=a7cf249b3cde291890fa1addf96c96da30a9f9f0

[mac80211] fix for commit r17276


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17280 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/generic-2.6/patches-2.6.27/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.27/940-wireless_mesh_header.patch
index be43f1b81..e766e2ecf 100644
--- a/target/linux/generic-2.6/patches-2.6.27/940-wireless_mesh_header.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/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
+@@ -326,7 +326,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
+ 	/* 0/13/14 bit hole */
diff --git a/target/linux/generic-2.6/patches-2.6.28/940-wireless_mesh_header.patch b/target/linux/generic-2.6/patches-2.6.28/940-wireless_mesh_header.patch
index adf416eff..28b3fbf91 100644
--- a/target/linux/generic-2.6/patches-2.6.28/940-wireless_mesh_header.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/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
+@@ -332,7 +332,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
+ 	/* 0/13/14 bit hole */
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 3f5c2dd47..202f998dd 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