* [PATCH 1/9] comapt-wireless: move doku to the correct place in config.mk
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 2/9] compat-wireless: rename CONFIG_COMPAT_KERNEL_ Hauke Mehrtens
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config.mk b/config.mk
index 99485a4..9a18441 100644
--- a/config.mk
+++ b/config.mk
@@ -14,11 +14,6 @@ else
include $(KLIB_BUILD)/.config
endif
-# We will warn when you don't have MQ support or NET_SCHED enabled.
-#
-# We could consider just quiting if MQ and NET_SCHED is disabled
-# as I suspect all users of this package want 802.11e (WME) and
-# 802.11n (HT) support.
ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
COMPAT_LATEST_VERSION = 39
KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
@@ -62,6 +57,11 @@ endif
ifneq ($(KERNELRELEASE),) # This prevents a warning
+# We will warn when you don't have MQ support or NET_SCHED enabled.
+#
+# We could consider just quiting if MQ and NET_SCHED is disabled
+# as I suspect all users of this package want 802.11e (WME) and
+# 802.11n (HT) support.
ifeq ($(CONFIG_NET_SCHED),)
QOS_REQS_MISSING+=CONFIG_NET_SCHED
endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/9] compat-wireless: rename CONFIG_COMPAT_KERNEL_
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 1/9] comapt-wireless: move doku to the correct place in config.mk Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 3/9] compat-wireless: add support for kernel 3.XX Hauke Mehrtens
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Rename CONFIG_COMPAT_KERNEL_XX to CONFIG_COMPAT_KERNEL_26XX.
This is needed to support kernel version 3.XX. It will get
CONFIG_COMPAT_KERNEL_3XX. This patch needs a additional change in
compat.git.
Add to compat-3.0-stable
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 86 ++++++++++++++++++++--------------------
scripts/gen-compat-autoconf.sh | 4 +-
2 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/config.mk b/config.mk
index 9a18441..57903e0 100644
--- a/config.mk
+++ b/config.mk
@@ -18,11 +18,11 @@ ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
COMPAT_LATEST_VERSION = 39
KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
-$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
+$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_26$(ver)=y))
-ifdef CONFIG_COMPAT_KERNEL_24
+ifdef CONFIG_COMPAT_KERNEL_2624
$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
-endif #CONFIG_COMPAT_KERNEL_24
+endif #CONFIG_COMPAT_KERNEL_2624
ifeq ($(CONFIG_CFG80211),y)
$(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
@@ -92,20 +92,20 @@ else
endif
# The Bluetooth compatibility only builds on kernels >= 2.6.27 for now
-ifndef CONFIG_COMPAT_KERNEL_27
+ifndef CONFIG_COMPAT_KERNEL_2627
ifeq ($(CONFIG_BT),y)
# we'll ignore compiling bluetooth
else
CONFIG_COMPAT_BLUETOOTH=y
CONFIG_COMPAT_BLUETOOTH_MODULES=m
endif
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
-ifdef CONFIG_COMPAT_KERNEL_33
+ifdef CONFIG_COMPAT_KERNEL_2633
ifdef CONFIG_FW_LOADER
CONFIG_COMPAT_FIRMWARE_CLASS=m
endif #CONFIG_FW_LOADER
-endif #CONFIG_COMPAT_KERNEL_33
+endif #CONFIG_COMPAT_KERNEL_2633
# Wireless subsystem stuff
CONFIG_MAC80211=m
@@ -165,9 +165,9 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
ifdef CONFIG_ISDN_CAPI
CONFIG_BT_CMTP=m
endif #CONFIG_ISDN_CAPI
-ifndef CONFIG_COMPAT_KERNEL_28
+ifndef CONFIG_COMPAT_KERNEL_2628
CONFIG_COMPAT_BT_HIDP=m
-endif #CONFIG_COMPAT_KERNEL_28
+endif #CONFIG_COMPAT_KERNEL_2628
CONFIG_BT_HCIUART=M
CONFIG_BT_HCIUART_H4=y
@@ -345,11 +345,11 @@ CONFIG_MWL8K=m
CONFIG_ATL1=m
CONFIG_ATL2=m
CONFIG_ATL1E=m
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_ATL1C=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_ATL1C=m
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
ifdef CONFIG_WIRELESS_EXT
CONFIG_HERMES=m
@@ -379,13 +379,13 @@ endif #CONFIG_PCI
ifdef CONFIG_PCMCIA
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS=n
CONFIG_LIBERTAS_CS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_CS=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
endif #CONFIG_PCMCIA
## end of PCMCIA
@@ -395,10 +395,10 @@ CONFIG_EEPROM_93CX6=m
# USB Drivers
ifdef CONFIG_USB
-ifndef CONFIG_COMPAT_KERNEL_29
+ifndef CONFIG_COMPAT_KERNEL_2629
CONFIG_COMPAT_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG=y
-endif #CONFIG_COMPAT_KERNEL_29
+endif #CONFIG_COMPAT_KERNEL_2629
# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
@@ -407,12 +407,12 @@ endif #CONFIG_COMPAT_KERNEL_29
# is only wireless RNDIS chip known to date.
# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
-ifdef CONFIG_COMPAT_KERNEL_29
+ifdef CONFIG_COMPAT_KERNEL_2629
CONFIG_USB_COMPAT_USBNET=n
CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
CONFIG_USB_NET_COMPAT_CDCETHER=n
-else #CONFIG_COMPAT_KERNEL_29
+else #CONFIG_COMPAT_KERNEL_2629
CONFIG_USB_COMPAT_USBNET=m
ifdef CONFIG_USB_NET_CDCETHER
CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
@@ -423,7 +423,7 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
endif #CONFIG_USB_NET_CDCETHER
CONFIG_USB_NET_COMPAT_CDCETHER=m
-endif #CONFIG_COMPAT_KERNEL_29
+endif #CONFIG_COMPAT_KERNEL_2629
CONFIG_P54_USB=m
@@ -434,14 +434,14 @@ endif #CONFIG_MAC80211_LEDS
CONFIG_AT76C50X_USB=m
-ifndef CONFIG_COMPAT_KERNEL_29
+ifndef CONFIG_COMPAT_KERNEL_2629
CONFIG_CARL9170=m
ifdef CONFIG_MAC80211_LEDS
CONFIG_CARL9170_LEDS=y
endif #CONFIG_MAC80211_LEDS
# CONFIG_CARL9170_DEBUGFS=y
# CONFIG_CARL9170_WPC=y
-endif #CONFIG_COMPAT_KERNEL_29
+endif #CONFIG_COMPAT_KERNEL_2629
# This activates a threading fix for usb urb.
# this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351
@@ -467,15 +467,15 @@ ifdef CONFIG_CRC_ITU_T
CONFIG_RT73USB=m
endif #CONFIG_CRC_ITU_T
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_THINFIRM_USB=n
CONFIG_LIBERTAS_USB=n
NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_USB=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
CONFIG_ORINOCO_USB=m
@@ -490,7 +490,7 @@ CONFIG_RTL8192CU=m
endif #CONFIG_USB end of USB driver list
ifdef CONFIG_SPI_MASTER
-ifndef CONFIG_COMPAT_KERNEL_25
+ifndef CONFIG_COMPAT_KERNEL_2625
ifdef CONFIG_CRC7
CONFIG_WL1251_SPI=m
@@ -498,15 +498,15 @@ CONFIG_WL12XX_SPI=m
endif #CONFIG_CRC7
CONFIG_P54_SPI=m
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SPI=n
NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SPI=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
-endif #CONFIG_COMPAT_KERNEL_25
+endif #CONFIG_COMPAT_KERNEL_2625
endif #CONFIG_SPI_MASTER end of SPI driver list
ifdef CONFIG_MMC
@@ -519,23 +519,23 @@ ifdef CONFIG_WL12XX_PLATFORM_DATA
CONFIG_COMPAT_WL1251_SDIO=m
endif #CONFIG_WL12XX_PLATFORM_DATA
-ifndef CONFIG_COMPAT_KERNEL_32
+ifndef CONFIG_COMPAT_KERNEL_2632
ifdef CONFIG_WL12XX_PLATFORM_DATA
CONFIG_COMPAT_WL12XX_SDIO=m
endif #CONFIG_WL12XX_PLATFORM_DATA
-endif #CONFIG_COMPAT_KERNEL_32
+endif #CONFIG_COMPAT_KERNEL_2632
endif #CONFIG_CRC7
CONFIG_MWIFIEX_SDIO=m
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SDIO=n
NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SDIO=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
CONFIG_IWM=m
# CONFIG_IWM_DEBUG=y
@@ -574,13 +574,13 @@ CONFIG_RT2800_LIB=m
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_RT2X00_LIB_SOC=y
-ifdef CONFIG_COMPAT_KERNEL_25
+ifdef CONFIG_COMPAT_KERNEL_2625
CONFIG_RT2X00_LIB_LEDS=n
-else #CONFIG_COMPAT_KERNEL_25
+else #CONFIG_COMPAT_KERNEL_2625
ifdef CONFIG_LEDS_CLASS
CONFIG_RT2X00_LIB_LEDS=y
endif #CONFIG_LEDS_CLASS
-endif #CONFIG_COMPAT_KERNEL_25
+endif #CONFIG_COMPAT_KERNEL_2625
# CONFIG_RT2X00_DEBUG=y
# CONFIG_RT2X00_LIB_DEBUGFS
endif
@@ -608,24 +608,24 @@ endif #CONFIG_CRC7
CONFIG_MWIFIEX=m
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
ifeq ($(NEED_LIBERTAS),y)
CONFIG_LIBERTAS_THINFIRM=m
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_MESH=y
# CONFIG_LIBERTAS_DEBUG=y
endif
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
# We need the backported rfkill module on kernel < 2.6.31.
# In more recent kernel versions use the in kernel rfkill module.
-ifdef CONFIG_COMPAT_KERNEL_31
+ifdef CONFIG_COMPAT_KERNEL_2631
CONFIG_RFKILL_BACKPORT=m
ifdef CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_LEDS=y
endif #CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_INPUT=y
-endif #CONFIG_COMPAT_KERNEL_31
+endif #CONFIG_COMPAT_KERNEL_2631
diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
index 9f6e6d2..0dc091c 100755
--- a/scripts/gen-compat-autoconf.sh
+++ b/scripts/gen-compat-autoconf.sh
@@ -148,11 +148,11 @@ kernel_version_req $OLDEST_KERNEL_SUPPORTED
for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else #CONFIG_' $COMPAT_CONFIG | sed 's/ /+/'); do
case $i in
'ifdef+CONFIG_'* )
- echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/'
+ echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_26\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/'
continue
;;
'ifndef+CONFIG_'* )
- echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
+ echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_26\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
continue
;;
'else+#CONFIG_'* | 'endif+#CONFIG_'* )
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/9] compat-wireless: add support for kernel 3.XX
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 1/9] comapt-wireless: move doku to the correct place in config.mk Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 2/9] compat-wireless: rename CONFIG_COMPAT_KERNEL_ Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-03 9:07 ` Jonas Gorski
2011-06-02 16:35 ` [PATCH 4/9] compat-wireless: make patches apply again Hauke Mehrtens
` (5 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Now we are also generating CONFIG_COMPAT_KERNEL_3XX entries for kernel
3.XX kernels. This is the final patch needed to add support for kernel
3.0.
When using a 2.6.XX kernel it generates CONFIG_COMPAT_KERNEL_26XX
entries and all CONFIG_COMPAT_KERNEL_3XX entries and when using 3.XX
kernel it will generate only the needed CONFIG_COMPAT_KERNEL_3XX
entries.
Add to compat-3.0-stable
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 22 ++++++++++++++++++----
scripts/gen-compat-autoconf.sh | 15 ++++++++++++++-
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/config.mk b/config.mk
index 57903e0..2160409 100644
--- a/config.mk
+++ b/config.mk
@@ -15,10 +15,22 @@ include $(KLIB_BUILD)/.config
endif
ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
-COMPAT_LATEST_VERSION = 39
-KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+
+COMPAT_LATEST_VERSION = 1
+KERNEL_VERSION := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p')
+
+ifeq ($(KERNEL_VERSION),3)
+KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^3\.\([0-9]\+\).*/\1/p')
+else
+COMPAT_26LATEST_VERSION = 39
+KERNEL_26SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+COMPAT_26VERSIONS := $(shell I=$(COMPAT_26LATEST_VERSION); while [ "$$I" -gt $(KERNEL_26SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
+$(foreach ver,$(COMPAT_26VERSIONS),$(eval CONFIG_COMPAT_KERNEL_26$(ver)=y))
+KERNEL_SUBLEVEL := -1
+endif
+
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
-$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_26$(ver)=y))
+$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3$(ver)=y))
ifdef CONFIG_COMPAT_KERNEL_2624
$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
@@ -49,11 +61,13 @@ endif
#
# 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 ($(KERNEL_VERSION),2)
+ifeq ($(shell test $(KERNEL_26SUBLEVEL) -ge 27 -a $(KERNEL_26SUBLEVEL) -le 31 && echo yes),yes)
ifeq ($(CONFIG_MAC80211),)
$(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
+endif
ifneq ($(KERNELRELEASE),) # This prevents a warning
diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
index 0dc091c..af19da6 100755
--- a/scripts/gen-compat-autoconf.sh
+++ b/scripts/gen-compat-autoconf.sh
@@ -155,6 +155,14 @@ for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else
echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_26\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
continue
;;
+ 'ifdef+CONFIG_'* )
+ echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/'
+ continue
+ ;;
+ 'ifndef+CONFIG_'* )
+ echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
+ continue
+ ;;
'else+#CONFIG_'* | 'endif+#CONFIG_'* )
echo "#$i */" |sed -e 's/+#/ \/* /g'
continue
@@ -184,7 +192,12 @@ done
# Deal with special cases. CONFIG_MAC80211_QOS is such a case.
# We handle this specially for different kernels we support.
if [ -f $KLIB_BUILD/Makefile ]; then
- SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+ MAJORLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p')
+ if [ $MAJORLEVEL -eq 2 ]; then
+ SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+ else
+ SUBLEVEL=99
+ fi
if [ $SUBLEVEL -le 22 ]; then
define_config CONFIG_MAC80211_QOS y
else # kernel >= 2.6.23
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/9] compat-wireless: add support for kernel 3.XX
2011-06-02 16:35 ` [PATCH 3/9] compat-wireless: add support for kernel 3.XX Hauke Mehrtens
@ 2011-06-03 9:07 ` Jonas Gorski
2011-06-03 11:33 ` Hauke Mehrtens
0 siblings, 1 reply; 13+ messages in thread
From: Jonas Gorski @ 2011-06-03 9:07 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: mcgrof, lrodriguez, linux-wireless
Hi,
On 2 June 2011 18:35, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> --- a/scripts/gen-compat-autoconf.sh
> +++ b/scripts/gen-compat-autoconf.sh
> @@ -155,6 +155,14 @@ for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else
> echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_26\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
> continue
> ;;
> + 'ifdef+CONFIG_'* )
> + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/'
> + continue
> + ;;
> + 'ifndef+CONFIG_'* )
> + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
> + continue
> + ;;
I admit, I don't have much shell script experience, but I'm surprised
that having the same case multiple times works.
I would probably just add the -e ' ... KERNEL_3\... ' part to the
original sed lines (they are already much too long anyway ;-).
> 'else+#CONFIG_'* | 'endif+#CONFIG_'* )
> echo "#$i */" |sed -e 's/+#/ \/* /g'
> continue
> @@ -184,7 +192,12 @@ done
> # Deal with special cases. CONFIG_MAC80211_QOS is such a case.
> # We handle this specially for different kernels we support.
> if [ -f $KLIB_BUILD/Makefile ]; then
> - SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
> + MAJORLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p')
> + if [ $MAJORLEVEL -eq 2 ]; then
> + SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
> + else
> + SUBLEVEL=99
> + fi
You could drop setting sublevel to 99 by changing
> if [ $SUBLEVEL -le 22 ]; then
to
if [ $MAJORLEVEL -eq 2 -a $SUBLEVEL -le 22 ]
this would be a bit cleaner IMHO.
Jonas
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 3/9] compat-wireless: add support for kernel 3.XX
2011-06-03 9:07 ` Jonas Gorski
@ 2011-06-03 11:33 ` Hauke Mehrtens
2011-06-04 0:26 ` Luis R. Rodriguez
0 siblings, 1 reply; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-03 11:33 UTC (permalink / raw)
To: Jonas Gorski; +Cc: mcgrof, lrodriguez, linux-wireless
Thank you for the review.
On 06/03/2011 11:07 AM, Jonas Gorski wrote:
> Hi,
>
> On 2 June 2011 18:35, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> --- a/scripts/gen-compat-autoconf.sh
>> +++ b/scripts/gen-compat-autoconf.sh
>> @@ -155,6 +155,14 @@ for i in $(egrep '^CONFIG_|^ifdef CONFIG_|^ifndef CONFIG_|^endif #CONFIG_|^else
>> echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_26\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,\2))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
>> continue
>> ;;
>> + 'ifdef+CONFIG_'* )
>> + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifdef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE < KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifdef \)\(CONFIG_[^:space:]*\)/#if defined(\2) || defined(\2_MODULE)/'
>> + continue
>> + ;;
>> + 'ifndef+CONFIG_'* )
>> + echo "#$i" | sed -e 's/+/ /' -e 's/\(ifndef CONFIG_COMPAT_KERNEL_3\)\([0-9]*\)/if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,\2,0))/' -e 's/\(#ifndef \)\(CONFIG_[^:space:]*\)/#if !defined(\2) && !defined(\2_MODULE)/'
>> + continue
>> + ;;
>
> I admit, I don't have much shell script experience, but I'm surprised
> that having the same case multiple times works.
> I would probably just add the -e ' ... KERNEL_3\... ' part to the
> original sed lines (they are already much too long anyway ;-).
yes the patch is wrong, I will fix that.
>
>> 'else+#CONFIG_'* | 'endif+#CONFIG_'* )
>> echo "#$i */" |sed -e 's/+#/ \/* /g'
>> continue
>> @@ -184,7 +192,12 @@ done
>> # Deal with special cases. CONFIG_MAC80211_QOS is such a case.
>> # We handle this specially for different kernels we support.
>> if [ -f $KLIB_BUILD/Makefile ]; then
>> - SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
>> + MAJORLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p')
>> + if [ $MAJORLEVEL -eq 2 ]; then
>> + SUBLEVEL=$(make -C $KLIB_BUILD kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
>> + else
>> + SUBLEVEL=99
>> + fi
>
> You could drop setting sublevel to 99 by changing
>
>> if [ $SUBLEVEL -le 22 ]; then
>
> to
>
> if [ $MAJORLEVEL -eq 2 -a $SUBLEVEL -le 22 ]
>
> this would be a bit cleaner IMHO.
Yes that's better.
>
>
> Jonas
I will resend the patches with these fixes.
Hauke
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/9] compat-wireless: make patches apply again
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
` (2 preceding siblings ...)
2011-06-02 16:35 ` [PATCH 3/9] compat-wireless: add support for kernel 3.XX Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 5/9] compat-wireless: add missing header Hauke Mehrtens
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/09-threaded-irq.patch | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index acfe043..d13e3cc 100644
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -6,39 +6,39 @@ thread in process context as well.
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -3970,8 +3970,13 @@ redo:
- if (dev->sdev->bus->bustype == SSB_BUSTYPE_SDIO) {
+@@ -3971,8 +3971,13 @@ redo:
+ if (b43_bus_host_is_sdio(dev->dev)) {
b43_sdio_free_irq(dev);
} else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ compat_synchronize_threaded_irq(&dev->irq_compat);
+ compat_free_threaded_irq(&dev->irq_compat);
+#else
- synchronize_irq(dev->sdev->irq);
- free_irq(dev->sdev->irq, dev);
+ synchronize_irq(dev->dev->irq);
+ free_irq(dev->dev->irq, dev);
+#endif
}
mutex_lock(&wl->mutex);
dev = wl->current_dev;
-@@ -4011,9 +4016,17 @@ static int b43_wireless_core_start(struc
+@@ -4012,9 +4017,17 @@ static int b43_wireless_core_start(struc
goto out;
}
} else {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ err = compat_request_threaded_irq(&dev->irq_compat,
-+ dev->sdev->irq,
++ dev->dev->irq,
+ b43_interrupt_handler,
+ b43_interrupt_thread_handler,
+ IRQF_SHARED, KBUILD_MODNAME, dev);
+#else
- err = request_threaded_irq(dev->sdev->irq, b43_interrupt_handler,
+ err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler,
b43_interrupt_thread_handler,
IRQF_SHARED, KBUILD_MODNAME, dev);
+#endif
if (err) {
b43err(dev->wl, "Cannot request IRQ-%d\n",
- dev->sdev->irq);
-@@ -4728,6 +4741,10 @@ static int b43_setup_bands(struct b43_wl
+ dev->dev->irq);
+@@ -4734,6 +4747,10 @@ static int b43_setup_bands(struct b43_wl
static void b43_wireless_core_detach(struct b43_wldev *dev)
{
@@ -51,7 +51,7 @@ thread in process context as well.
b43_release_firmware(dev);
--- a/drivers/net/wireless/b43/b43.h
+++ b/drivers/net/wireless/b43/b43.h
-@@ -772,6 +772,9 @@ struct b43_wldev {
+@@ -774,6 +774,9 @@ struct b43_wldev {
unsigned int tx_count;
unsigned int rx_count;
#endif
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/9] compat-wireless: add missing header
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
` (3 preceding siblings ...)
2011-06-02 16:35 ` [PATCH 4/9] compat-wireless: make patches apply again Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 6/9] compat-wireless: activate CARL9170_WPC by default Hauke Mehrtens
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
This adds mac80211_hwsim.h
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
scripts/admin-update.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index ea123ca..de810b5 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -259,7 +259,7 @@ DRIVERS_BT="drivers/bluetooth"
# Drivers that belong the the wireless directory
DRIVER_FILES="adm8211.c adm8211.h"
DRIVER_FILES="$DRIVER_FILES rndis_wlan.c"
-DRIVER_FILES="$DRIVER_FILES mac80211_hwsim.c"
+DRIVER_FILES="$DRIVER_FILES mac80211_hwsim.c mac80211_hwsim.h"
DRIVER_FILES="$DRIVER_FILES at76c50x-usb.c at76c50x-usb.h"
DRIVER_FILES="$DRIVER_FILES mwl8k.c"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/9] compat-wireless: activate CARL9170_WPC by default
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
` (4 preceding siblings ...)
2011-06-02 16:35 ` [PATCH 5/9] compat-wireless: add missing header Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 7/9] compat-wireless: activate CONFIG_RT2800{USB,PCI}_RT35XX " Hauke Mehrtens
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Add to compat-3.0-stable
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/config.mk b/config.mk
index 2160409..00408bf 100644
--- a/config.mk
+++ b/config.mk
@@ -454,7 +454,7 @@ ifdef CONFIG_MAC80211_LEDS
CONFIG_CARL9170_LEDS=y
endif #CONFIG_MAC80211_LEDS
# CONFIG_CARL9170_DEBUGFS=y
-# CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_WPC=y
endif #CONFIG_COMPAT_KERNEL_2629
# This activates a threading fix for usb urb.
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/9] compat-wireless: activate CONFIG_RT2800{USB,PCI}_RT35XX by default.
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
` (5 preceding siblings ...)
2011-06-02 16:35 ` [PATCH 6/9] compat-wireless: activate CARL9170_WPC by default Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 8/9] compat-wireless: sync atheros-debug.mk with config.mk Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 9/9] compat-wireless: update enable-older-kernels patches Hauke Mehrtens
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
This is now activated by default in the Kconfig so it should be save for us too.
Add to compat-3.0-stable
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
config.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mk b/config.mk
index 00408bf..0a60ab9 100644
--- a/config.mk
+++ b/config.mk
@@ -341,7 +341,7 @@ CONFIG_RT2500PCI=m
ifdef CONFIG_CRC_CCITT
CONFIG_RT2800PCI=m
CONFIG_RT2800PCI_RT33XX=y
-# CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT35XX=y
# CONFIG_RT2800PCI_RT53XX=y
endif #CONFIG_CRC_CCITT
NEED_RT2X00=y
@@ -470,7 +470,7 @@ CONFIG_RT2500USB=m
ifdef CONFIG_CRC_CCITT
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
-# CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT35XX=y
# CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_UNKNOWN=y
endif #CONFIG_CRC_CCITT
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 8/9] compat-wireless: sync atheros-debug.mk with config.mk
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
` (6 preceding siblings ...)
2011-06-02 16:35 ` [PATCH 7/9] compat-wireless: activate CONFIG_RT2800{USB,PCI}_RT35XX " Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
2011-06-02 16:35 ` [PATCH 9/9] compat-wireless: update enable-older-kernels patches Hauke Mehrtens
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Add to compat-3.0-stable
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
defconfigs/atheros-debug.mk | 247 ++++++++++++++++++++++++++-----------------
1 files changed, 150 insertions(+), 97 deletions(-)
diff --git a/defconfigs/atheros-debug.mk b/defconfigs/atheros-debug.mk
index d9534eb..81ddee6 100644
--- a/defconfigs/atheros-debug.mk
+++ b/defconfigs/atheros-debug.mk
@@ -14,20 +14,27 @@ else
include $(KLIB_BUILD)/.config
endif
-# We will warn when you don't have MQ support or NET_SCHED enabled.
-#
-# We could consider just quiting if MQ and NET_SCHED is disabled
-# as I suspect all users of this package want 802.11e (WME) and
-# 802.11n (HT) support.
ifneq ($(wildcard $(KLIB_BUILD)/Makefile),)
-COMPAT_LATEST_VERSION = 37
-KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+
+COMPAT_LATEST_VERSION = 1
+KERNEL_VERSION := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^\([0-9]\)\..*/\1/p')
+
+ifeq ($(KERNEL_VERSION),3)
+KERNEL_SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^3\.\([0-9]\+\).*/\1/p')
+else
+COMPAT_26LATEST_VERSION = 39
+KERNEL_26SUBLEVEL := $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+COMPAT_26VERSIONS := $(shell I=$(COMPAT_26LATEST_VERSION); while [ "$$I" -gt $(KERNEL_26SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
+$(foreach ver,$(COMPAT_26VERSIONS),$(eval CONFIG_COMPAT_KERNEL_26$(ver)=y))
+KERNEL_SUBLEVEL := -1
+endif
+
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
-$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
+$(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3$(ver)=y))
-ifdef CONFIG_COMPAT_KERNEL_24
+ifdef CONFIG_COMPAT_KERNEL_2624
$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
-endif #CONFIG_COMPAT_KERNEL_24
+endif #CONFIG_COMPAT_KERNEL_2624
ifeq ($(CONFIG_CFG80211),y)
$(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
@@ -54,14 +61,21 @@ endif
#
# 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 ($(KERNEL_VERSION),2)
+ifeq ($(shell test $(KERNEL_26SUBLEVEL) -ge 27 -a $(KERNEL_26SUBLEVEL) -le 31 && echo yes),yes)
ifeq ($(CONFIG_MAC80211),)
$(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
+endif
ifneq ($(KERNELRELEASE),) # This prevents a warning
+# We will warn when you don't have MQ support or NET_SCHED enabled.
+#
+# We could consider just quiting if MQ and NET_SCHED is disabled
+# as I suspect all users of this package want 802.11e (WME) and
+# 802.11n (HT) support.
ifeq ($(CONFIG_NET_SCHED),)
QOS_REQS_MISSING+=CONFIG_NET_SCHED
endif
@@ -92,21 +106,20 @@ else
endif
# The Bluetooth compatibility only builds on kernels >= 2.6.27 for now
-ifndef CONFIG_COMPAT_KERNEL_27
+ifndef CONFIG_COMPAT_KERNEL_2627
ifeq ($(CONFIG_BT),y)
# we'll ignore compiling bluetooth
else
CONFIG_COMPAT_BLUETOOTH=y
CONFIG_COMPAT_BLUETOOTH_MODULES=m
endif
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
-ifdef CONFIG_COMPAT_KERNEL_33
+ifdef CONFIG_COMPAT_KERNEL_2633
ifdef CONFIG_FW_LOADER
CONFIG_COMPAT_FIRMWARE_CLASS=m
endif #CONFIG_FW_LOADER
-endif #CONFIG_COMPAT_KERNEL_33
-
+endif #CONFIG_COMPAT_KERNEL_2633
# Wireless subsystem stuff
CONFIG_MAC80211=m
@@ -133,7 +146,9 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstrel_ht
CONFIG_MAC80211_RC_PID=y
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
+ifdef CONFIG_LEDS_TRIGGERS
CONFIG_MAC80211_LEDS=y
+endif #CONFIG_LEDS_TRIGGERS
# enable mesh networking too
CONFIG_MAC80211_MESH=y
@@ -153,8 +168,8 @@ CONFIG_LIB80211_CRYPT_TKIP=m
# CONFIG_LIB80211_DEBUG=y
CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_COMPAT_BT_L2CAP=y
+CONFIG_COMPAT_BT_SCO=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
@@ -164,7 +179,9 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
ifdef CONFIG_ISDN_CAPI
CONFIG_BT_CMTP=m
endif #CONFIG_ISDN_CAPI
-CONFIG_BT_HIDP=m
+ifndef CONFIG_COMPAT_KERNEL_2628
+CONFIG_COMPAT_BT_HIDP=m
+endif #CONFIG_COMPAT_KERNEL_2628
CONFIG_BT_HCIUART=M
CONFIG_BT_HCIUART_H4=y
@@ -196,26 +213,24 @@ else #CONFIG_CFG80211_WEXT
$(warning "WARNING: CONFIG_CFG80211_WEXT will be deactivated or not working because kernel was compiled with CONFIG_WIRELESS_EXT=n. Tools using wext interface like iwconfig will not work. To activate it build your kernel e.g. with CONFIG_LIBIPW=m.")
endif #CONFIG_WIRELESS_EXT
-ifneq ($(CONFIG_STAGING),)
- CONFIG_COMPAT_STAGING=m
-endif
+ifdef CONFIG_STAGING
+CONFIG_COMPAT_STAGING=m
+endif #CONFIG_STAGING
# mac80211 test driver
CONFIG_MAC80211_HWSIM=m
-# PCI Drivers
-ifdef CONFIG_PCI
-
CONFIG_ATH5K=m
CONFIG_ATH5K_DEBUG=y
-CONFIG_ATH9K_HW=m
+# CONFIG_ATH5K_AHB=y
+
CONFIG_ATH9K=m
-# Note: once ath9k_htc is added we'll have to move
-# CONFIG_ATH9K_COMMON to an area that doesn't depend on PCI
-# as you could then have ath9k disabled but ath9k_htc enabled.
+CONFIG_ATH9K_HW=m
CONFIG_ATH9K_COMMON=m
CONFIG_ATH9K_DEBUGFS=y
+# CONFIG_ATH9K_AHB=y
CONFIG_ATH9K_PKTLOG=y
+
# Disable this to get minstrel as default, we leave the ath9k
# rate control algorithm as the default for now as that is also
# default upstream on the kernel. We will move this to minstrel
@@ -224,15 +239,25 @@ CONFIG_ATH9K_PKTLOG=y
# for long range considerations.
CONFIG_ATH9K_RATE_CONTROL=y
+# PCI Drivers
+ifdef CONFIG_PCI
-CONFIG_COMPAT_IWLWIFI=m
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_PCI=y
+
+CONFIG_IWLAGN=m
# CONFIG_IWLWIFI_DEBUG=y
# CONFIG_IWLWIFI_DEBUGFS=y
# CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLAGN=m
-CONFIG_COMPAT_IWL4965=y
-CONFIG_IWL5000=y
+# CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE=y
+CONFIG_IWL_P2P=y
+
+CONFIG_IWLWIFI_LEGACY=m
+CONFIG_COMPAT_IWL4965=m
CONFIG_IWL3945=m
+# CONFIG_IWLWIFI_LEGACY_DEBUG=y
+# CONFIG_IWLWIFI_LEGACY_DEBUGFS=y
+# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING=y
CONFIG_B43=m
@@ -241,16 +266,20 @@ CONFIG_B43_PCI_AUTOSELECT=y
ifdef CONFIG_PCMCIA
CONFIG_B43_PCMCIA=y
endif #CONFIG_PCMCIA
+ifdef CONFIG_MAC80211_LEDS
CONFIG_B43_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_B43_PHY_LP=y
-CONFIG_B43_NPHY=y
+CONFIG_B43_PHY_N=y
# CONFIG_B43_FORCE_PIO=y
# CONFIG_B43_DEBUG=y
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_HWRNG=y
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+ifdef CONFIG_MAC80211_LEDS
CONFIG_B43LEGACY_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
@@ -286,7 +315,6 @@ endif #CONFIG_WIRELESS_EXT
ifdef CONFIG_SSB
# Sonics Silicon Backplane
CONFIG_SSB_SPROM=y
-# CONFIG_SSB_DEBUG=y
CONFIG_SSB_BLOCKIO=y
CONFIG_SSB_PCIHOST=y
@@ -312,10 +340,9 @@ CONFIG_RT2400PCI=m
CONFIG_RT2500PCI=m
ifdef CONFIG_CRC_CCITT
CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_PCI=y
-# CONFIG_RT2800PCI_RT30XX=y
-# CONFIG_RT2800PCI_RT35XX=y
-# CONFIG_RT2800PCI_SOC=y
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+# CONFIG_RT2800PCI_RT53XX=y
endif #CONFIG_CRC_CCITT
NEED_RT2X00=y
@@ -324,7 +351,6 @@ NEED_RT2X00=y
# driver as we're in the PCI section.
ifdef CONFIG_CRC_ITU_T
CONFIG_RT61PCI=m
-NEED_RT2X00_FIRMWARE=y
endif #CONFIG_CRC_ITU_T
CONFIG_MWL8K=m
@@ -333,11 +359,11 @@ CONFIG_MWL8K=m
CONFIG_ATL1=m
CONFIG_ATL2=m
CONFIG_ATL1E=m
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_ATL1C=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_ATL1C=m
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
ifdef CONFIG_WIRELESS_EXT
CONFIG_HERMES=m
@@ -355,18 +381,25 @@ CONFIG_PCMCIA_SPECTRUM=m
endif #CONFIG_PCMCIA
endif #CONFIG_WIRELESS_EXT
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+
+ifdef CONFIG_COMPAT_STAGING
+CONFIG_BRCMSMAC=m
+endif #CONFIG_COMPAT_STAGING
+
endif #CONFIG_PCI
## end of PCI
ifdef CONFIG_PCMCIA
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS=n
CONFIG_LIBERTAS_CS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_CS=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
endif #CONFIG_PCMCIA
## end of PCMCIA
@@ -376,8 +409,10 @@ CONFIG_EEPROM_93CX6=m
# USB Drivers
ifdef CONFIG_USB
-CONFIG_ZD1211RW=m
+ifndef CONFIG_COMPAT_KERNEL_2629
+CONFIG_COMPAT_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG=y
+endif #CONFIG_COMPAT_KERNEL_2629
# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
@@ -386,38 +421,41 @@ CONFIG_ZD1211RW=m
# is only wireless RNDIS chip known to date.
# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
-ifdef CONFIG_COMPAT_KERNEL_29
+ifdef CONFIG_COMPAT_KERNEL_2629
CONFIG_USB_COMPAT_USBNET=n
CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
CONFIG_USB_NET_COMPAT_CDCETHER=n
-else #CONFIG_COMPAT_KERNEL_29
+else #CONFIG_COMPAT_KERNEL_2629
CONFIG_USB_COMPAT_USBNET=m
ifdef CONFIG_USB_NET_CDCETHER
CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
endif #CONFIG_USB_NET_CDCETHER
+ifdef CONFIG_USB_NET_CDCETHER_MODULE
+CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
+CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
+endif #CONFIG_USB_NET_CDCETHER
CONFIG_USB_NET_COMPAT_CDCETHER=m
-endif #CONFIG_COMPAT_KERNEL_29
+endif #CONFIG_COMPAT_KERNEL_2629
CONFIG_P54_USB=m
CONFIG_RTL8187=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_RTL8187_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_AT76C50X_USB=m
-ifndef CONFIG_COMPAT_KERNEL_28
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-endif #CONFIG_COMPAT_KERNEL_28
-
-ifndef CONFIG_COMPAT_KERNEL_29
+ifndef CONFIG_COMPAT_KERNEL_2629
CONFIG_CARL9170=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_CARL9170_LEDS=y
+endif #CONFIG_MAC80211_LEDS
CONFIG_CARL9170_DEBUGFS=y
CONFIG_CARL9170_WPC=y
-endif #CONFIG_COMPAT_KERNEL_29
+endif #CONFIG_COMPAT_KERNEL_2629
# This activates a threading fix for usb urb.
# this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351
@@ -431,8 +469,9 @@ CONFIG_ATH9K_HTC_DEBUGFS=y
CONFIG_RT2500USB=m
ifdef CONFIG_CRC_CCITT
CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+# CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_UNKNOWN=y
endif #CONFIG_CRC_CCITT
CONFIG_RT2X00_LIB_USB=m
@@ -440,18 +479,17 @@ NEED_RT2X00=y
# RT73USB requires firmware
ifdef CONFIG_CRC_ITU_T
CONFIG_RT73USB=m
-NEED_RT2X00_FIRMWARE=y
endif #CONFIG_CRC_ITU_T
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_THINFIRM_USB=n
CONFIG_LIBERTAS_USB=n
NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_THINFIRM_USB=m
CONFIG_LIBERTAS_USB=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
CONFIG_ORINOCO_USB=m
@@ -461,26 +499,28 @@ CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_ATH3K=m
+CONFIG_RTL8192CU=m
+
endif #CONFIG_USB end of USB driver list
ifdef CONFIG_SPI_MASTER
-ifndef CONFIG_COMPAT_KERNEL_25
+ifndef CONFIG_COMPAT_KERNEL_2625
ifdef CONFIG_CRC7
CONFIG_WL1251_SPI=m
-CONFIG_WL1271_SPI=m
+CONFIG_WL12XX_SPI=m
endif #CONFIG_CRC7
CONFIG_P54_SPI=m
-ifdef CONFIG_COMPAT_KERNEL_27
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SPI=n
NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SPI=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
-endif #CONFIG_COMPAT_KERNEL_25
+endif #CONFIG_COMPAT_KERNEL_2625
endif #CONFIG_SPI_MASTER end of SPI driver list
ifdef CONFIG_MMC
@@ -489,23 +529,27 @@ CONFIG_SSB_SDIOHOST=y
CONFIG_B43_SDIO=y
ifdef CONFIG_CRC7
-CONFIG_WL1251_SDIO=m
+ifdef CONFIG_WL12XX_PLATFORM_DATA
+CONFIG_COMPAT_WL1251_SDIO=m
+endif #CONFIG_WL12XX_PLATFORM_DATA
-ifndef CONFIG_COMPAT_KERNEL_32
+ifndef CONFIG_COMPAT_KERNEL_2632
ifdef CONFIG_WL12XX_PLATFORM_DATA
-CONFIG_WL1271_SDIO=m
+CONFIG_COMPAT_WL12XX_SDIO=m
endif #CONFIG_WL12XX_PLATFORM_DATA
-endif #CONFIG_COMPAT_KERNEL_32
+endif #CONFIG_COMPAT_KERNEL_2632
endif #CONFIG_CRC7
-ifdef CONFIG_COMPAT_KERNEL_27
+CONFIG_MWIFIEX_SDIO=m
+
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SDIO=n
NEED_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS_SDIO=m
NEED_LIBERTAS=y
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
CONFIG_IWM=m
# CONFIG_IWM_DEBUG=y
@@ -513,10 +557,8 @@ CONFIG_IWM=m
CONFIG_BT_HCIBTSDIO=m
CONFIG_BT_MRVL_SDIO=m
-ifneq ($(CONFIG_COMPAT_STAGING),)
+ifdef CONFIG_COMPAT_STAGING
ifdef CONFIG_WIRELESS_EXT
-CONFIG_ATH6KL_CFG80211=y
-CONFIG_ATH6KL_DEBUG=y
# CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set
# CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
# CONFIG_ATH6KL_ENABLE_HOST_DEBUG is not set
@@ -527,66 +569,77 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
CONFIG_ATH6K_LEGACY=m
-CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+CONFIG_BRCMFMAC=m
endif #CONFIG_WIRELESS_EXT
-endif #CONFIG_MMC
+endif #CONFIG_COMPAT_STAGING
+
+endif #CONFIG_MMC
-endif # end of SDIO driver list
+CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
# Common rt2x00 requirements
ifeq ($(NEED_RT2X00),y)
CONFIG_RT2X00=y
CONFIG_RT2X00_LIB=m
CONFIG_RT2800_LIB=m
-CONFIG_RT2X00_LIB_HT=y
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
-ifdef CONFIG_COMPAT_KERNEL_25
+# CONFIG_RT2X00_LIB_SOC=y
+ifdef CONFIG_COMPAT_KERNEL_2625
CONFIG_RT2X00_LIB_LEDS=n
-else #CONFIG_COMPAT_KERNEL_25
+else #CONFIG_COMPAT_KERNEL_2625
+ifdef CONFIG_LEDS_CLASS
CONFIG_RT2X00_LIB_LEDS=y
-endif #CONFIG_COMPAT_KERNEL_25
+endif #CONFIG_LEDS_CLASS
+endif #CONFIG_COMPAT_KERNEL_2625
# CONFIG_RT2X00_DEBUG=y
# CONFIG_RT2X00_LIB_DEBUGFS
endif
-ifeq ($(NEED_RT2X00_FIRMWARE),y)
-CONFIG_RT2X00_LIB_FIRMWARE=y
-endif
-
# p54
CONFIG_P54_COMMON=m
+ifdef CONFIG_MAC80211_LEDS
CONFIG_P54_LEDS=y
+endif #CONFIG_MAC80211_LEDS
# Atheros
CONFIG_ATH_COMMON=m
CONFIG_ATH_DEBUG=y
-CONFIG_WL12XX=y
+ifdef CONFIG_COMPAT_STAGING
+CONFIG_BRCMUTIL=m
+# CONFIG_BRCMDBG=y
+endif #CONFIG_COMPAT_STAGING
+
ifdef CONFIG_CRC7
CONFIG_WL1251=m
-CONFIG_WL1271=m
+CONFIG_WL12XX=m
+CONFIG_WL12XX_HT=y
endif #CONFIG_CRC7
-ifdef CONFIG_COMPAT_KERNEL_27
+CONFIG_MWIFIEX=m
+
+ifdef CONFIG_COMPAT_KERNEL_2627
CONFIG_LIBERTAS=n
-else #CONFIG_COMPAT_KERNEL_27
+else #CONFIG_COMPAT_KERNEL_2627
ifeq ($(NEED_LIBERTAS),y)
CONFIG_LIBERTAS_THINFIRM=m
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_MESH=y
# CONFIG_LIBERTAS_DEBUG=y
endif
-endif #CONFIG_COMPAT_KERNEL_27
+endif #CONFIG_COMPAT_KERNEL_2627
# We need the backported rfkill module on kernel < 2.6.31.
# In more recent kernel versions use the in kernel rfkill module.
-ifdef CONFIG_COMPAT_KERNEL_31
+ifdef CONFIG_COMPAT_KERNEL_2631
CONFIG_RFKILL_BACKPORT=m
+ifdef CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_LEDS=y
+endif #CONFIG_LEDS_TRIGGERS
CONFIG_RFKILL_BACKPORT_INPUT=y
-endif #CONFIG_COMPAT_KERNEL_31
+endif #CONFIG_COMPAT_KERNEL_2631
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 9/9] compat-wireless: update enable-older-kernels patches
2011-06-02 16:35 [PATCH 0/9] compat-wireless: Add support for kernel 3.XX Hauke Mehrtens
` (7 preceding siblings ...)
2011-06-02 16:35 ` [PATCH 8/9] compat-wireless: sync atheros-debug.mk with config.mk Hauke Mehrtens
@ 2011-06-02 16:35 ` Hauke Mehrtens
8 siblings, 0 replies; 13+ messages in thread
From: Hauke Mehrtens @ 2011-06-02 16:35 UTC (permalink / raw)
To: mcgrof, lrodriguez; +Cc: linux-wireless, Hauke Mehrtens
Add to compat-3.0-stable
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
enable-older-kernels/enable-2.6.21.patch | 12 ++++++------
enable-older-kernels/enable-2.6.22.patch | 12 ++++++------
enable-older-kernels/enable-2.6.23.patch | 12 ++++++------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/enable-older-kernels/enable-2.6.21.patch b/enable-older-kernels/enable-2.6.21.patch
index 2c16809..b370483 100644
--- a/enable-older-kernels/enable-2.6.21.patch
+++ b/enable-older-kernels/enable-2.6.21.patch
@@ -1,15 +1,15 @@
--- a/config.mk
+++ b/config.mk
-@@ -25,9 +25,9 @@
+@@ -32,9 +32,9 @@ endif
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
- $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
+ $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3$(ver)=y))
--ifdef CONFIG_COMPAT_KERNEL_24
+-ifdef CONFIG_COMPAT_KERNEL_2624
-$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
--endif #CONFIG_COMPAT_KERNEL_24
-+ifdef CONFIG_COMPAT_KERNEL_21
+-endif #CONFIG_COMPAT_KERNEL_2624
++ifdef CONFIG_COMPAT_KERNEL_2621
+$(error "ERROR: compat-wireless by default supports kernels >= 2.6.21, try enabling only one driver though")
-+endif #CONFIG_COMPAT_KERNEL_21
++endif #CONFIG_COMPAT_KERNEL_2621
ifeq ($(CONFIG_CFG80211),y)
$(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
diff --git a/enable-older-kernels/enable-2.6.22.patch b/enable-older-kernels/enable-2.6.22.patch
index 92150e9..28a0d70 100644
--- a/enable-older-kernels/enable-2.6.22.patch
+++ b/enable-older-kernels/enable-2.6.22.patch
@@ -1,15 +1,15 @@
--- a/config.mk
+++ b/config.mk
-@@ -25,9 +25,9 @@
+@@ -32,9 +32,9 @@ endif
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
- $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
+ $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3$(ver)=y))
--ifdef CONFIG_COMPAT_KERNEL_24
+-ifdef CONFIG_COMPAT_KERNEL_2624
-$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
--endif #CONFIG_COMPAT_KERNEL_24
-+ifdef CONFIG_COMPAT_KERNEL_22
+-endif #CONFIG_COMPAT_KERNEL_2624
++ifdef CONFIG_COMPAT_KERNEL_2622
+$(error "ERROR: compat-wireless by default supports kernels >= 2.6.22, try enabling only one driver though")
-+endif #CONFIG_COMPAT_KERNEL_22
++endif #CONFIG_COMPAT_KERNEL_2622
ifeq ($(CONFIG_CFG80211),y)
$(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
diff --git a/enable-older-kernels/enable-2.6.23.patch b/enable-older-kernels/enable-2.6.23.patch
index 6266c17..a228b65 100644
--- a/enable-older-kernels/enable-2.6.23.patch
+++ b/enable-older-kernels/enable-2.6.23.patch
@@ -1,15 +1,15 @@
--- a/config.mk
+++ b/config.mk
-@@ -25,9 +25,9 @@
+@@ -32,9 +32,9 @@ endif
COMPAT_VERSIONS := $(shell I=$(COMPAT_LATEST_VERSION); while [ "$$I" -gt $(KERNEL_SUBLEVEL) ]; do echo $$I; I=$$(($$I - 1)); done)
- $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_$(ver)=y))
+ $(foreach ver,$(COMPAT_VERSIONS),$(eval CONFIG_COMPAT_KERNEL_3$(ver)=y))
--ifdef CONFIG_COMPAT_KERNEL_24
+-ifdef CONFIG_COMPAT_KERNEL_2624
-$(error "ERROR: compat-wireless by default supports kernels >= 2.6.24, try enabling only one driver though")
--endif #CONFIG_COMPAT_KERNEL_24
-+ifdef CONFIG_COMPAT_KERNEL_23
+-endif #CONFIG_COMPAT_KERNEL_2624
++ifdef CONFIG_COMPAT_KERNEL_2623
+$(error "ERROR: compat-wireless by default supports kernels >= 2.6.23, try enabling only one driver though")
-+endif #CONFIG_COMPAT_KERNEL_23
++endif #CONFIG_COMPAT_KERNEL_2623
ifeq ($(CONFIG_CFG80211),y)
$(error "ERROR: your kernel has CONFIG_CFG80211=y, you should have it CONFIG_CFG80211=m if you want to use this thing.")
--
1.7.4.1
^ permalink raw reply related [flat|nested] 13+ messages in thread