mac80211: Use backports-4.19-rc5-1.tar.xz
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / build / 060-no_local_ssb_bcma.patch
1 --- a/local-symbols
2 +++ b/local-symbols
3 @@ -396,43 +396,6 @@ USB_IPHETH=
4 USB_SIERRA_NET=
5 USB_VL600=
6 USB_NET_CH9200=
7 -SSB_POSSIBLE=
8 -SSB=
9 -SSB_SPROM=
10 -SSB_BLOCKIO=
11 -SSB_PCIHOST_POSSIBLE=
12 -SSB_PCIHOST=
13 -SSB_B43_PCI_BRIDGE=
14 -SSB_PCMCIAHOST_POSSIBLE=
15 -SSB_PCMCIAHOST=
16 -SSB_SDIOHOST_POSSIBLE=
17 -SSB_SDIOHOST=
18 -SSB_HOST_SOC=
19 -SSB_SERIAL=
20 -SSB_DRIVER_PCICORE_POSSIBLE=
21 -SSB_DRIVER_PCICORE=
22 -SSB_PCICORE_HOSTMODE=
23 -SSB_DRIVER_MIPS=
24 -SSB_SFLASH=
25 -SSB_EMBEDDED=
26 -SSB_DRIVER_EXTIF=
27 -SSB_DRIVER_GIGE=
28 -SSB_DRIVER_GPIO=
29 -BCMA_POSSIBLE=
30 -BCMA=
31 -BCMA_BLOCKIO=
32 -BCMA_HOST_PCI_POSSIBLE=
33 -BCMA_HOST_PCI=
34 -BCMA_HOST_SOC=
35 -BCMA_DRIVER_PCI=
36 -BCMA_DRIVER_PCI_HOSTMODE=
37 -BCMA_DRIVER_MIPS=
38 -BCMA_PFLASH=
39 -BCMA_SFLASH=
40 -BCMA_NFLASH=
41 -BCMA_DRIVER_GMAC_CMN=
42 -BCMA_DRIVER_GPIO=
43 -BCMA_DEBUG=
44 USB_ACM=
45 USB_PRINTER=
46 USB_WDM=
47 --- a/drivers/net/wireless/broadcom/b43/Kconfig
48 +++ b/drivers/net/wireless/broadcom/b43/Kconfig
49 @@ -61,21 +61,21 @@ endchoice
50 config B43_PCI_AUTOSELECT
51 bool
52 depends on B43 && SSB_PCIHOST_POSSIBLE
53 - select SSB_PCIHOST
54 - select SSB_B43_PCI_BRIDGE
55 + depends on SSB_PCIHOST
56 + depends on SSB_B43_PCI_BRIDGE
57 default y
58
59 # Auto-select SSB PCICORE driver, if possible
60 config B43_PCICORE_AUTOSELECT
61 bool
62 depends on B43 && SSB_DRIVER_PCICORE_POSSIBLE
63 - select SSB_DRIVER_PCICORE
64 + depends on SSB_DRIVER_PCICORE
65 default y
66
67 config B43_SDIO
68 bool "Broadcom 43xx SDIO device support"
69 depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE
70 - select SSB_SDIOHOST
71 + depends on SSB_SDIOHOST
72 ---help---
73 Broadcom 43xx device support for Soft-MAC SDIO devices.
74
75 @@ -94,13 +94,13 @@ config B43_SDIO
76 config B43_BCMA_PIO
77 bool
78 depends on B43 && B43_BCMA
79 - select BCMA_BLOCKIO
80 + depends on BCMA_BLOCKIO
81 default y
82
83 config B43_PIO
84 bool
85 depends on B43 && B43_SSB
86 - select SSB_BLOCKIO
87 + depends on SSB_BLOCKIO
88 default y
89
90 config B43_PHY_G
91 --- a/drivers/net/wireless/broadcom/b43/main.c
92 +++ b/drivers/net/wireless/broadcom/b43/main.c
93 @@ -2876,7 +2876,7 @@ static struct ssb_device *b43_ssb_gpio_d
94 {
95 struct ssb_bus *bus = dev->dev->sdev->bus;
96
97 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
98 +#ifdef CONFIG_SSB_DRIVER_PCICORE
99 return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
100 #else
101 return bus->chipco.dev;
102 @@ -4893,7 +4893,7 @@ static int b43_wireless_core_init(struct
103 }
104 if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
105 hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
106 -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
107 +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
108 if (dev->dev->bus_type == B43_BUS_SSB &&
109 dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
110 dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
111 --- a/drivers/net/wireless/broadcom/b43legacy/Kconfig
112 +++ b/drivers/net/wireless/broadcom/b43legacy/Kconfig
113 @@ -2,7 +2,7 @@ config B43LEGACY
114 tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)"
115 depends on m
116 depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
117 - select SSB
118 + depends on SSB
119 depends on FW_LOADER
120 ---help---
121 b43legacy is a driver for 802.11b devices from Broadcom (BCM4301 and
122 @@ -24,15 +24,15 @@ config B43LEGACY
123 config B43LEGACY_PCI_AUTOSELECT
124 bool
125 depends on B43LEGACY && SSB_PCIHOST_POSSIBLE
126 - select SSB_PCIHOST
127 - select SSB_B43_PCI_BRIDGE
128 + depends on SSB_PCIHOST
129 + depends on SSB_B43_PCI_BRIDGE
130 default y
131
132 # Auto-select SSB PCICORE driver, if possible
133 config B43LEGACY_PCICORE_AUTOSELECT
134 bool
135 depends on B43LEGACY && SSB_DRIVER_PCICORE_POSSIBLE
136 - select SSB_DRIVER_PCICORE
137 + depends on SSB_DRIVER_PCICORE
138 default y
139
140 # LED support
141 --- a/drivers/net/wireless/broadcom/b43legacy/main.c
142 +++ b/drivers/net/wireless/broadcom/b43legacy/main.c
143 @@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
144 if (dev->dev->id.revision >= 2)
145 mask |= 0x0010; /* FIXME: This is redundant. */
146
147 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
148 +#ifdef CONFIG_SSB_DRIVER_PCICORE
149 pcidev = bus->pcicore.dev;
150 #endif
151 gpiodev = bus->chipco.dev ? : pcidev;
152 @@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
153 struct ssb_bus *bus = dev->dev->bus;
154 struct ssb_device *gpiodev, *pcidev = NULL;
155
156 -#ifdef CPTCFG_SSB_DRIVER_PCICORE
157 +#ifdef CONFIG_SSB_DRIVER_PCICORE
158 pcidev = bus->pcicore.dev;
159 #endif
160 gpiodev = bus->chipco.dev ? : pcidev;
161 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
162 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
163 @@ -22,7 +22,7 @@ struct brcms_led {
164 bool active_low;
165 };
166
167 -#ifdef CPTCFG_BCMA_DRIVER_GPIO
168 +#ifdef CONFIG_BCMA_DRIVER_GPIO
169 void brcms_led_unregister(struct brcms_info *wl);
170 int brcms_led_register(struct brcms_info *wl);
171 #else
172 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
173 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
174 @@ -42,6 +42,6 @@ brcmsmac-y := \
175 brcms_trace_events.o \
176 debug.o
177
178 -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
179 +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
180
181 obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
182 --- a/drivers/net/wireless/broadcom/brcm80211/Kconfig
183 +++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig
184 @@ -7,7 +7,7 @@ config BRCMSMAC
185 depends on m
186 depends on MAC80211
187 depends on BCMA_POSSIBLE
188 - select BCMA
189 + depends on BCMA
190 select NEW_LEDS if BCMA_DRIVER_GPIO
191 select LEDS_CLASS if BCMA_DRIVER_GPIO
192 select BRCMUTIL
193 --- a/Kconfig.local
194 +++ b/Kconfig.local
195 @@ -1192,117 +1192,6 @@ config BACKPORTED_USB_VL600
196 config BACKPORTED_USB_NET_CH9200
197 tristate
198 default USB_NET_CH9200
199 -config BACKPORTED_SSB_POSSIBLE
200 - tristate
201 - default SSB_POSSIBLE
202 -config BACKPORTED_SSB
203 - tristate
204 - default SSB
205 -config BACKPORTED_SSB_SPROM
206 - tristate
207 - default SSB_SPROM
208 -config BACKPORTED_SSB_BLOCKIO
209 - tristate
210 - default SSB_BLOCKIO
211 -config BACKPORTED_SSB_PCIHOST_POSSIBLE
212 - tristate
213 - default SSB_PCIHOST_POSSIBLE
214 -config BACKPORTED_SSB_PCIHOST
215 - tristate
216 - default SSB_PCIHOST
217 -config BACKPORTED_SSB_B43_PCI_BRIDGE
218 - tristate
219 - default SSB_B43_PCI_BRIDGE
220 -config BACKPORTED_SSB_PCMCIAHOST_POSSIBLE
221 - tristate
222 - default SSB_PCMCIAHOST_POSSIBLE
223 -config BACKPORTED_SSB_PCMCIAHOST
224 - tristate
225 - default SSB_PCMCIAHOST
226 -config BACKPORTED_SSB_SDIOHOST_POSSIBLE
227 - tristate
228 - default SSB_SDIOHOST_POSSIBLE
229 -config BACKPORTED_SSB_SDIOHOST
230 - tristate
231 - default SSB_SDIOHOST
232 -config BACKPORTED_SSB_HOST_SOC
233 - tristate
234 - default SSB_HOST_SOC
235 -config BACKPORTED_SSB_SERIAL
236 - tristate
237 - default SSB_SERIAL
238 -config BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE
239 - tristate
240 - default SSB_DRIVER_PCICORE_POSSIBLE
241 -config BACKPORTED_SSB_DRIVER_PCICORE
242 - tristate
243 - default SSB_DRIVER_PCICORE
244 -config BACKPORTED_SSB_PCICORE_HOSTMODE
245 - tristate
246 - default SSB_PCICORE_HOSTMODE
247 -config BACKPORTED_SSB_DRIVER_MIPS
248 - tristate
249 - default SSB_DRIVER_MIPS
250 -config BACKPORTED_SSB_SFLASH
251 - tristate
252 - default SSB_SFLASH
253 -config BACKPORTED_SSB_EMBEDDED
254 - tristate
255 - default SSB_EMBEDDED
256 -config BACKPORTED_SSB_DRIVER_EXTIF
257 - tristate
258 - default SSB_DRIVER_EXTIF
259 -config BACKPORTED_SSB_DRIVER_GIGE
260 - tristate
261 - default SSB_DRIVER_GIGE
262 -config BACKPORTED_SSB_DRIVER_GPIO
263 - tristate
264 - default SSB_DRIVER_GPIO
265 -config BACKPORTED_BCMA_POSSIBLE
266 - tristate
267 - default BCMA_POSSIBLE
268 -config BACKPORTED_BCMA
269 - tristate
270 - default BCMA
271 -config BACKPORTED_BCMA_BLOCKIO
272 - tristate
273 - default BCMA_BLOCKIO
274 -config BACKPORTED_BCMA_HOST_PCI_POSSIBLE
275 - tristate
276 - default BCMA_HOST_PCI_POSSIBLE
277 -config BACKPORTED_BCMA_HOST_PCI
278 - tristate
279 - default BCMA_HOST_PCI
280 -config BACKPORTED_BCMA_HOST_SOC
281 - tristate
282 - default BCMA_HOST_SOC
283 -config BACKPORTED_BCMA_DRIVER_PCI
284 - tristate
285 - default BCMA_DRIVER_PCI
286 -config BACKPORTED_BCMA_DRIVER_PCI_HOSTMODE
287 - tristate
288 - default BCMA_DRIVER_PCI_HOSTMODE
289 -config BACKPORTED_BCMA_DRIVER_MIPS
290 - tristate
291 - default BCMA_DRIVER_MIPS
292 -config BACKPORTED_BCMA_PFLASH
293 - tristate
294 - default BCMA_PFLASH
295 -config BACKPORTED_BCMA_SFLASH
296 - tristate
297 - default BCMA_SFLASH
298 -config BACKPORTED_BCMA_NFLASH
299 - tristate
300 - default BCMA_NFLASH
301 -config BACKPORTED_BCMA_DRIVER_GMAC_CMN
302 - tristate
303 - default BCMA_DRIVER_GMAC_CMN
304 -config BACKPORTED_BCMA_DRIVER_GPIO
305 - tristate
306 - default BCMA_DRIVER_GPIO
307 -config BACKPORTED_BCMA_DEBUG
308 - tristate
309 - default BCMA_DEBUG
310 config BACKPORTED_USB_ACM
311 tristate
312 default USB_ACM
313 --- a/Kconfig.sources
314 +++ b/Kconfig.sources
315 @@ -7,9 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconf
316 source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
317 source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
318
319 -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
320 -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
321 -
322 source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
323
324 source "$BACKPORT_DIR/drivers/staging/Kconfig"
325 --- a/Makefile.kernel
326 +++ b/Makefile.kernel
327 @@ -40,8 +40,6 @@ obj-y += compat/
328 obj-$(CPTCFG_CFG80211) += net/wireless/
329 obj-$(CPTCFG_MAC80211) += net/mac80211/
330 obj-$(CPTCFG_WLAN) += drivers/net/wireless/
331 -obj-$(CPTCFG_SSB) += drivers/ssb/
332 -obj-$(CPTCFG_BCMA) += drivers/bcma/
333 obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
334
335 obj-$(CPTCFG_USB_WDM) += drivers/usb/class/