mac80211: merge pending cfg80211 patches to fix a race condition with setting the...
[openwrt.git] / package / mac80211 / patches / 007-remove_misc_drivers.patch
1 --- a/config.mk
2 +++ b/config.mk
3 @@ -196,7 +196,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
4 endif #CONFIG_WIRELESS_EXT
5
6 ifneq ($(CONFIG_STAGING),)
7 - CONFIG_COMPAT_STAGING=m
8 +# CONFIG_COMPAT_STAGING=m
9 endif
10
11 # mac80211 test driver
12 @@ -314,13 +314,13 @@ endif #CONFIG_CRC_ITU_T
13 CONFIG_MWL8K=m
14
15 # Ethernet drivers go here
16 -CONFIG_ATL1=m
17 -CONFIG_ATL2=m
18 -CONFIG_ATL1E=m
19 +# CONFIG_ATL1=m
20 +# CONFIG_ATL2=m
21 +# CONFIG_ATL1E=m
22 ifdef CONFIG_COMPAT_KERNEL_27
23 -CONFIG_ATL1C=n
24 +# CONFIG_ATL1C=n
25 else #CONFIG_COMPAT_KERNEL_27
26 -CONFIG_ATL1C=m
27 +# CONFIG_ATL1C=m
28 endif #CONFIG_COMPAT_KERNEL_27
29
30 ifdef CONFIG_WIRELESS_EXT
31 @@ -371,17 +371,17 @@ CONFIG_ZD1211RW=m
32 # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
33 # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
34 ifdef CONFIG_COMPAT_KERNEL_29
35 -CONFIG_USB_COMPAT_USBNET=n
36 -CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
37 -CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
38 -CONFIG_USB_NET_COMPAT_CDCETHER=n
39 +# CONFIG_USB_COMPAT_USBNET=n
40 +# CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
41 +# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
42 +# CONFIG_USB_NET_COMPAT_CDCETHER=n
43 else #CONFIG_COMPAT_KERNEL_29
44 -CONFIG_USB_COMPAT_USBNET=m
45 +# CONFIG_USB_COMPAT_USBNET=m
46 ifdef CONFIG_USB_NET_CDCETHER
47 -CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
48 -CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
49 +# CONFIG_USB_NET_COMPAT_RNDIS_HOST=m
50 +# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=m
51 endif #CONFIG_USB_NET_CDCETHER
52 -CONFIG_USB_NET_COMPAT_CDCETHER=m
53 +# CONFIG_USB_NET_COMPAT_CDCETHER=m
54 endif #CONFIG_COMPAT_KERNEL_29
55
56
This page took 0.044384 seconds and 5 git commands to generate.