From a67a0b0bb2ad1ddc57c010d78fef1823fc48fd4f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 15 Aug 2009 22:12:17 +0000 Subject: [PATCH] [mac80211] fix for commit r17276 SVN-Revision: 17280 --- .../patches-2.6.27/940-wireless_mesh_header.patch | 11 +++++++++++ .../patches-2.6.28/940-wireless_mesh_header.patch | 11 +++++++++++ .../patches-2.6.30/940-wireless_mesh_header.patch | 11 +++++++++++ 3 files changed, 33 insertions(+) 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 be43f1b81c..e766e2ecfd 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 adf416eff4..28b3fbf915 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 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 -- 2.30.2