aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/007-remove_misc_drivers.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-08-31 23:34:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-08-31 23:34:21 +0000
commit2f014eb8e82152c3e31fba135b45cdf026de7fd1 (patch)
tree509489e635a0f907a8838797bfbaf7f105afc883 /package/mac80211/patches/007-remove_misc_drivers.patch
parentece9b523e446692c9361336d1f0b6cbd6a3df257 (diff)
downloadupstream-2f014eb8e82152c3e31fba135b45cdf026de7fd1.tar.gz
upstream-2f014eb8e82152c3e31fba135b45cdf026de7fd1.tar.bz2
upstream-2f014eb8e82152c3e31fba135b45cdf026de7fd1.zip
mac80211: update to wireless-testing 2010-08-31
SVN-Revision: 22865
Diffstat (limited to 'package/mac80211/patches/007-remove_misc_drivers.patch')
-rw-r--r--package/mac80211/patches/007-remove_misc_drivers.patch63
1 files changed, 53 insertions, 10 deletions
diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index 1fb8353330..89757b0644 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,6 +1,15 @@
--- a/config.mk
+++ b/config.mk
-@@ -282,13 +282,13 @@ endif
+@@ -196,7 +196,7 @@ ifneq ($(CONFIG_WIRELESS_EXT),)
+ endif
+
+ ifneq ($(CONFIG_STAGING),)
+-CONFIG_COMPAT_STAGING=m
++# CONFIG_COMPAT_STAGING=m
+ endif
+
+ # mac80211 test driver
+@@ -306,13 +306,13 @@ endif
CONFIG_MWL8K=m
# Ethernet drivers go here
@@ -13,24 +22,58 @@
ifdef CONFIG_COMPAT_KERNEL_27
-CONFIG_ATL1C=n
+# CONFIG_ATL1C=n
- else
+ else #CONFIG_COMPAT_KERNEL_27
-CONFIG_ATL1C=m
+# CONFIG_ATL1C=m
- endif
+ endif #CONFIG_COMPAT_KERNEL_27
CONFIG_HERMES=m
-@@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
- CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
- CONFIG_USB_NET_COMPAT_CDCETHER=n
- else
+@@ -361,17 +361,17 @@ CONFIG_ZD1211RW=m
+ # 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
+-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
++# 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
-CONFIG_USB_COMPAT_USBNET=m
++# CONFIG_USB_COMPAT_USBNET=m
+ ifdef CONFIG_USB_NET_CDCETHER
-CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
-CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
--CONFIG_USB_NET_COMPAT_CDCETHER=m
-+# CONFIG_USB_COMPAT_USBNET=m
+# 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
+# CONFIG_USB_NET_COMPAT_CDCETHER=m
- endif
+ endif #CONFIG_COMPAT_KERNEL_29
+@@ -474,17 +474,17 @@ CONFIG_BT_MRVL_SDIO=m
+
+ ifneq ($(CONFIG_COMPAT_STAGING),)
+ ifdef CONFIG_COMPAT_KERNEL_32
+-CONFIG_ATH6KL_CFG80211=y
+-CONFIG_ATH6KL_DEBUG=y
++# 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
+-CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
++# CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
+ # CONFIG_ATH6KL_HCI_BRIDGE is not set
+ # CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+ # CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
+-CONFIG_ATH6K_LEGACY=m
++# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
++# CONFIG_ATH6K_LEGACY=m
+ endif #CONFIG_COMPAT_KERNEL_32
+ endif
+