ath9k: reorganize patches, reset hardware after full sleep (fixes #10349)

[openwrt.git] / package / mac80211 / patches / 007-remove_misc_drivers.patch

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index 89757b0..0b4b26e 100644 (file)
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,15 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -196,7 +196,7 @@ ifneq ($(CONFIG_WIRELESS_EXT),)
- endif
+@@ -213,7 +213,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+ endif #CONFIG_WIRELESS_EXT
  
- ifneq ($(CONFIG_STAGING),)
+ ifdef CONFIG_STAGING
 -CONFIG_COMPAT_STAGING=m
 +# CONFIG_COMPAT_STAGING=m
- endif
+ endif #CONFIG_STAGING
  
  # mac80211 test driver
-@@ -306,13 +306,13 @@ endif
+@@ -367,13 +367,13 @@ endif #CONFIG_CRC_ITU_T
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -19,19 +19,19 @@
 +# CONFIG_ATL1=m
 +# CONFIG_ATL2=m
 +# CONFIG_ATL1E=m
- ifdef CONFIG_COMPAT_KERNEL_27
+ ifdef CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=n
 +# CONFIG_ATL1C=n
- else #CONFIG_COMPAT_KERNEL_27
+ else #CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=m
 +# CONFIG_ATL1C=m
- endif #CONFIG_COMPAT_KERNEL_27
+ endif #CONFIG_COMPAT_KERNEL_2_6_27
  
- CONFIG_HERMES=m
-@@ -361,17 +361,17 @@ CONFIG_ZD1211RW=m
+ ifdef CONFIG_WIRELESS_EXT
+@@ -432,21 +432,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
  # 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_2_6_29
 -CONFIG_USB_COMPAT_USBNET=n
 -CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
 -CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
@@ -40,40 +40,23 @@
 +# 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_2_6_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_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
++# 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 #CONFIG_COMPAT_KERNEL_29
- 
- 
-@@ -474,17 +474,17 @@ CONFIG_BT_MRVL_SDIO=m
+ endif #CONFIG_COMPAT_KERNEL_2_6_29
  
- 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