Return-path: Received: from server19320154104.serverpool.info ([193.201.54.104]:33768 "EHLO hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541Ab0IKQTF (ORCPT ); Sat, 11 Sep 2010 12:19:05 -0400 From: Hauke Mehrtens To: lrodriguez@atheros.com Cc: linux-wireless@vger.kernel.org, mcgrof@infradead.org, Hauke Mehrtens Subject: [PATCH 4/8] compat-wireless: build if kernel does not have mac80211 Date: Sat, 11 Sep 2010 18:18:29 +0200 Message-Id: <1284221913-22455-6-git-send-email-hauke@hauke-m.de> In-Reply-To: <1284221913-22455-1-git-send-email-hauke@hauke-m.de> References: <1284221913-22455-1-git-send-email-hauke@hauke-m.de> Sender: linux-wireless-owner@vger.kernel.org List-ID: 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 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index 1498573..8b0038c 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 -- 1.7.0.4