From a5b5d4ccb894faa346d9bc9028b1db208331ca0d Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 Sep 2010 09:18:29 -0700 Subject: [PATCH] compat-wireless: build if kernel does not have mac80211 In kernel 2.6.31 the attributes do_not_encrypt and requeue were removed from struct sk_buff so we do not need mac80211 to be build while the kernel was build for nwer kernels. Signed-off-by: Hauke Mehrtens --- config.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 1498573c0b65..8b0038c5a4b2 100644 --- a/config.mk +++ b/config.mk @@ -52,9 +52,11 @@ endif # # 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 -- 2.30.2