diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-14 22:53:54 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-14 22:53:54 +0000 |
| commit | e30b799cdce79c4fe33c8bd09d2f289baf788382 (patch) | |
| tree | 0bfc5f31cc4ea54f7253c14f510eac831f1495d0 /package/mac80211/patches/009-remove_mac80211_module_dependence.patch | |
| parent | 872d5928d93dcbb73d86a06bfe3981cbd3e35baf (diff) | |
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23061 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/009-remove_mac80211_module_dependence.patch')
| -rw-r--r-- | package/mac80211/patches/009-remove_mac80211_module_dependence.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/mac80211/patches/009-remove_mac80211_module_dependence.patch b/package/mac80211/patches/009-remove_mac80211_module_dependence.patch index d0998b120..6c421b022 100644 --- 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 -@@ -42,21 +42,6 @@ $(error "ERROR: Your 2.6.27 kernel has C +@@ -42,23 +42,6 @@ $(error "ERROR: Your 2.6.27 kernel has C endif endif @@ -13,9 +13,11 @@ -# -# 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_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 - |