aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-08-15 16:42:48 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-08-15 16:42:48 +0000
commit5ecf08f8468c184639ca8a297e0b9416747c87f0 (patch)
tree83f927e4a862d629a2d891f6415135c744341ad5 /package/mac80211
parent74f53c2e564bf204db42cb6f183381594a0858e6 (diff)
downloadupstream-5ecf08f8468c184639ca8a297e0b9416747c87f0.tar.gz
upstream-5ecf08f8468c184639ca8a297e0b9416747c87f0.tar.bz2
upstream-5ecf08f8468c184639ca8a297e0b9416747c87f0.zip
[mac80211] Do not build the mac80211 module in the kernel.
The attributes skb->do_not_encrypt and skb->requeue in include/linux/skbuff.h are not used my mac80211 any more. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17276 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/009-remove_mac80211_module_dependence.patch24
-rw-r--r--package/mac80211/patches/402-ath9k-enable-debug.patch2
2 files changed, 25 insertions, 1 deletions
diff --git a/package/mac80211/patches/009-remove_mac80211_module_dependence.patch b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
new file mode 100644
index 0000000000..e84097aab0
--- /dev/null
+++ b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
@@ -0,0 +1,24 @@
+--- a/config.mk
++++ b/config.mk
+@@ -89,21 +89,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
+ endif
+ endif
+
+-# This is because with CONFIG_MAC80211 include/linux/skbuff.h will
+-# enable on 2.6.27 a new attribute:
+-#
+-# skb->do_not_encrypt
+-#
+-# and on 2.6.28 another new attribute:
+-#
+-# skb->requeue
+-#
+-ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 27 && echo yes),yes)
+-ifeq ($(CONFIG_MAC80211),)
+-$(error "ERROR: Your >=2.6.27 kernel has CONFIG_MAC80211 disabled, you should have it CONFIG_MAC80211=m if you want to use this thing.")
+-endif
+-endif
+-
+ ifneq ($(KERNELRELEASE),) # This prevents a warning
+
+ ifeq ($(CONFIG_NET_SCHED),)
diff --git a/package/mac80211/patches/402-ath9k-enable-debug.patch b/package/mac80211/patches/402-ath9k-enable-debug.patch
index 05de3120e7..92277a343b 100644
--- a/package/mac80211/patches/402-ath9k-enable-debug.patch
+++ b/package/mac80211/patches/402-ath9k-enable-debug.patch
@@ -1,6 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -171,7 +171,7 @@ ifneq ($(CONFIG_PCI),)
+@@ -156,7 +156,7 @@ ifneq ($(CONFIG_PCI),)
# CONFIG_ATH5K_DEBUG=y
# CONFIG_ATH5K_RFKILL=y
# CONFIG_ATH9K=m