mac80211: update to 2011-12-01

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 009-remove_mac80211_module_dependence.patch

diff --git a/package/mac80211/patches/009-remove_mac80211_module_dependence.patch b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
index e84097aab0d579920e6480a6d242a535c2326093..2e3753e13c7b09c7c30511d67c66d67ceee12996 100644 (file)
--- a/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
+++ b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -89,21 +89,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
+@@ -58,23 +58,6 @@ $(error "ERROR: Your 2.6.27 kernel has C
  endif
  endif
  
@@ -13,12 +13,14 @@
 -#
 -# skb->requeue
 -#
--ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 27 && echo yes),yes)
+-# In kernel 2.6.32 both attributes were removed.
+-#
+-ifeq ($(shell test $(KERNEL_VERSION) -eq 2 -a $(KERNEL_SUBLEVEL) -ge 27 -a $(KERNEL_SUBLEVEL) -le 31 && 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.")
+-$(error "ERROR: Your >=2.6.27 and <= 2.6.31 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),)
+ # We will warn when you don't have MQ support or NET_SCHED enabled.