mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
mac80211: update to wireless-testing 2012-02-23
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30742 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/config.mk
|
||||
+++ b/config.mk
|
||||
@@ -254,7 +254,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
|
||||
@@ -242,7 +242,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
|
||||
endif #CONFIG_WIRELESS_EXT
|
||||
|
||||
ifdef CONFIG_STAGING
|
||||
@@ -9,7 +9,7 @@
|
||||
endif #CONFIG_STAGING
|
||||
|
||||
# mac80211 test driver
|
||||
@@ -408,13 +408,13 @@ endif #CONFIG_CRC_ITU_T
|
||||
@@ -396,15 +396,15 @@ endif #CONFIG_CRC_ITU_T
|
||||
CONFIG_MWL8K=m
|
||||
|
||||
# Ethernet drivers go here
|
||||
@@ -21,14 +21,18 @@
|
||||
+# CONFIG_ATL1E=m
|
||||
ifdef CONFIG_COMPAT_KERNEL_2_6_27
|
||||
-CONFIG_ATL1C=n
|
||||
-CONFIG_ALX=m
|
||||
+# CONFIG_ATL1C=n
|
||||
+# CONFIG_ALX=m
|
||||
else #CONFIG_COMPAT_KERNEL_2_6_27
|
||||
-CONFIG_ATL1C=m
|
||||
+# CONFIG_ATL1C=m
|
||||
-CONFIG_ATL1C=n
|
||||
-CONFIG_ALX=m
|
||||
+# CONFIG_ATL1C=n
|
||||
+# CONFIG_ALX=m
|
||||
endif #CONFIG_COMPAT_KERNEL_2_6_27
|
||||
|
||||
ifdef CONFIG_WIRELESS_EXT
|
||||
@@ -475,21 +475,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
|
||||
@@ -465,21 +465,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_2_6_29
|
||||
|
||||
Reference in New Issue
Block a user