[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 be43f1b81c66834be6f22a7285818b3925e7b331..e766e2ecfd2bdb35b28a0ced29dab8bd77f7c49d 100644 (file)
--- 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 adf416eff4bd419eb520027255a9290b604c703a..28b3fbf915c18b22164e2be3689798cb80c6cf59 100644 (file)
--- 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 3f5c2dd47712695cafd0fc2bc7f2ec87c6bf3f93..202f998dde25708fd48a82baf6deac4033256900 100644 (file)
--- 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