Skip to contentSkip to conversation

wireless drivers vendor directories

PATCH Applied Kalle Valo 8 participants 45 messages Nov 18, 2015 – Nov 25, 2015

Subsystems (22)
lore
Share & tools
lore

Kalle Valo

author
#0 lore raw

v2 cover wireless drivers vendor directories

Hi,

I started to reorganise drivers/net/wireless directory and follow what drivers/net/ethernet has. The major change is that new vendor directories are created and most of the drivers are now under those vendor directories:

admtek/
ath/
atmel/
broadcom/
cisco/
intel/
intersil/
marvell/
mediatek/
ralink/
realtek/
rsi/
st/
ti/
zydas/

Only exception are these four drivers as they didn't have any sensible vendor name to use:

mac80211_hwsim
ray_cs
wl3501_cs
rndis_wlan

These Kconfig options are renamed:

CONFIG_WL_MEDIATEK -> CONFIG_WLAN_VENDOR_MEDIATEK
CONFIG_WL_TI -> CONFIG_WLAN_VENDOR_TI
CONFIG_ATH_CARDS -> CONFIG_WLAN_VENDOR_ATH

With these patches, and manually disabling all vendors and drivers, menuconfig will look like this:

--- Wireless LAN

[ ]   ADMtek devices                                                              
[ ]   Atheros/Qualcomm devices                                                    
[ ]   Atmel devices                                                               
[ ]   Broadcom devices                                                            
[ ]   Cisco devices                                                               
[ ]   Intel devices                                                               
[ ]   Intersil devices                                                            
[ ]   Marvell devices                                                             
[ ]   Mediatek devices                                                            
[ ]   Realtek devices                                                             
[ ]   Redpine Signals Inc devices                                                 
[ ]   STMicroelectronics devices                                                                  
[ ]   Texas Instrument devices                                                    
[ ]   ZyDAS devices                                                               
< >   Aviator/Raytheon 2.4GHz wireless support                                    
< >   Planet WL3501 PCMCIA cards                                                  
< >   Simulated radio testing tool for mac80211                                   
< >   Wireless RNDIS USB support                                                  

There's also a git branch which I keep up-to-date:

https://git.kernel.org/cgit/linux/kernel/git/kvalo/wireless-drivers-next.git/log/?h=wd-reorg

Please review and send comments.

v2:

* move all drivers

Kalle Valo (27):
adm80211: move under admtek vendor directory
airo: move under cisco vendor directory
atmel: move under atmel vendor directory
b43: move under broadcom vendor directory
b43legacy: move under broadcom vendor directory
brcm80211: move under broadcom vendor directory
cw1200: move under st vendor directory
ipw2x00: move under intel vendor directory
iwlegacy: move under intel directory
iwlwifi: move under intel vendor directory
libertas: move under marvell vendor directory
libertas_tf: move under marvell vendor directory
mwifiex: move under marvell vendor directory
mwl8k: move under marvell vendor directory
zd1201: move under zydas vendor directory
zd1211rw: move under zydas vendor directory
hostap: move under intersil vendor directory
p54: move under intersil vendor directory
orinoco: move under intersil vendor directory
prism54: move under intersil vendor directory
realtek: create separate Kconfig file
rsi: add vendor Kconfig entry
rt2x00: move under ralink vendor directory
mediatek: unify Kconfig with other vendors
ti: unify Kconfig with other vendors
ath: unify Kconfig with other vendors
mac80211_hwsim: move Kconfig entry for sorting alphabetically

 MAINTAINERS                                        |   46 ++--
 drivers/net/wireless/Kconfig                       |  238 +++-----------------
 drivers/net/wireless/Makefile                      |   65 ++----
 drivers/net/wireless/admtek/Kconfig                |   41 ++++
 drivers/net/wireless/admtek/Makefile               |    1 +
 drivers/net/wireless/{ => admtek}/adm8211.c        |    0
 drivers/net/wireless/{ => admtek}/adm8211.h        |    0
 drivers/net/wireless/ath/Kconfig                   |   17 +-
 drivers/net/wireless/atmel/Kconfig                 |   57 +++++
 drivers/net/wireless/atmel/Makefile                |    5 +
 drivers/net/wireless/{ => atmel}/at76c50x-usb.c    |    0
 drivers/net/wireless/{ => atmel}/at76c50x-usb.h    |    0
 drivers/net/wireless/{ => atmel}/atmel.c           |    0
 drivers/net/wireless/{ => atmel}/atmel.h           |    0
 drivers/net/wireless/{ => atmel}/atmel_cs.c        |    0
 drivers/net/wireless/{ => atmel}/atmel_pci.c       |    0
 drivers/net/wireless/broadcom/Kconfig              |   18 ++
 drivers/net/wireless/broadcom/Makefile             |    5 +
 drivers/net/wireless/{ => broadcom}/b43/Kconfig    |    0
 drivers/net/wireless/{ => broadcom}/b43/Makefile   |    0
 drivers/net/wireless/{ => broadcom}/b43/b43.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/bus.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/bus.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/debugfs.c  |    0
 drivers/net/wireless/{ => broadcom}/b43/debugfs.h  |    0
 drivers/net/wireless/{ => broadcom}/b43/dma.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/dma.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/leds.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/leds.h     |    0
 drivers/net/wireless/{ => broadcom}/b43/lo.c       |    0
 drivers/net/wireless/{ => broadcom}/b43/lo.h       |    0
 drivers/net/wireless/{ => broadcom}/b43/main.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/main.h     |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_a.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_a.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ac.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ac.h   |    0
 .../net/wireless/{ => broadcom}/b43/phy_common.c   |    0
 .../net/wireless/{ => broadcom}/b43/phy_common.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_g.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_g.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ht.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ht.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c  |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h  |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lp.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lp.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_n.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_n.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/pio.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/pio.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/ppr.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/ppr.h      |    0
 .../net/wireless/{ => broadcom}/b43/radio_2055.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2055.h   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2056.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2056.h   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2057.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2057.h   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2059.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2059.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/rfkill.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/rfkill.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/sdio.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/sdio.h     |    0
 drivers/net/wireless/{ => broadcom}/b43/sysfs.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/sysfs.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/tables.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/tables.h   |    0
 .../net/wireless/{ => broadcom}/b43/tables_lpphy.c |    0
 .../net/wireless/{ => broadcom}/b43/tables_lpphy.h |    0
 .../net/wireless/{ => broadcom}/b43/tables_nphy.c  |    0
 .../net/wireless/{ => broadcom}/b43/tables_nphy.h  |    0
 .../wireless/{ => broadcom}/b43/tables_phy_ht.c    |    0
 .../wireless/{ => broadcom}/b43/tables_phy_ht.h    |    0
 .../wireless/{ => broadcom}/b43/tables_phy_lcn.c   |    0
 .../wireless/{ => broadcom}/b43/tables_phy_lcn.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/wa.c       |    0
 drivers/net/wireless/{ => broadcom}/b43/wa.h       |    0
 drivers/net/wireless/{ => broadcom}/b43/xmit.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/xmit.h     |    0
 .../net/wireless/{ => broadcom}/b43legacy/Kconfig  |    0
 .../net/wireless/{ => broadcom}/b43legacy/Makefile |    0
 .../wireless/{ => broadcom}/b43legacy/b43legacy.h  |    0
 .../wireless/{ => broadcom}/b43legacy/debugfs.c    |    0
 .../wireless/{ => broadcom}/b43legacy/debugfs.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/dma.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/dma.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/ilt.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/ilt.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/leds.c   |    0
 .../net/wireless/{ => broadcom}/b43legacy/leds.h   |    0
 .../net/wireless/{ => broadcom}/b43legacy/main.c   |    0
 .../net/wireless/{ => broadcom}/b43legacy/main.h   |    0
 .../net/wireless/{ => broadcom}/b43legacy/phy.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/phy.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/pio.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/pio.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/radio.c  |    0
 .../net/wireless/{ => broadcom}/b43legacy/radio.h  |    0
 .../net/wireless/{ => broadcom}/b43legacy/rfkill.c |    0
 .../net/wireless/{ => broadcom}/b43legacy/rfkill.h |    0
 .../net/wireless/{ => broadcom}/b43legacy/sysfs.c  |    0
 .../net/wireless/{ => broadcom}/b43legacy/sysfs.h  |    0
 .../net/wireless/{ => broadcom}/b43legacy/xmit.c   |    0
 .../net/wireless/{ => broadcom}/b43legacy/xmit.h   |    0
 .../net/wireless/{ => broadcom}/brcm80211/Kconfig  |    0
 .../net/wireless/{ => broadcom}/brcm80211/Makefile |    0
 .../{ => broadcom}/brcm80211/brcmfmac/Makefile     |    4 +-
 .../{ => broadcom}/brcm80211/brcmfmac/bcdc.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/bcdc.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/btcoex.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/btcoex.h     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/bus.h        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/chip.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/chip.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/common.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/common.h     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/commonring.c |    0
 .../{ => broadcom}/brcm80211/brcmfmac/commonring.h |    0
 .../{ => broadcom}/brcm80211/brcmfmac/core.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/core.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/debug.c      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/debug.h      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/feature.c    |    0
 .../{ => broadcom}/brcm80211/brcmfmac/feature.h    |    0
 .../{ => broadcom}/brcm80211/brcmfmac/firmware.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/firmware.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/flowring.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/flowring.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fweh.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fweh.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil_types.h |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.h     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/of.c         |    0
 .../{ => broadcom}/brcm80211/brcmfmac/of.h         |    0
 .../{ => broadcom}/brcm80211/brcmfmac/p2p.c        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/p2p.h        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/pcie.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/pcie.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/proto.c      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/proto.h      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/sdio.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/sdio.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.c |    0
 .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.h |    0
 .../{ => broadcom}/brcm80211/brcmfmac/usb.c        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/usb.h        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/vendor.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/vendor.h     |    0
 .../{ => broadcom}/brcm80211/brcmsmac/Makefile     |    6 +-
 .../{ => broadcom}/brcm80211/brcmsmac/aiutils.c    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/aiutils.h    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/ampdu.c      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/ampdu.h      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/antsel.c     |    0
 .../{ => broadcom}/brcm80211/brcmsmac/antsel.h     |    0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h      |    0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h  |    0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h   |    0
 .../brcm80211/brcmsmac/brcms_trace_events.c        |    0
 .../brcm80211/brcmsmac/brcms_trace_events.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/channel.c    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/channel.h    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/d11.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/debug.c      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/debug.h      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/dma.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/dma.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/led.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/led.h        |    0
 .../brcm80211/brcmsmac/mac80211_if.c               |    0
 .../brcm80211/brcmsmac/mac80211_if.h               |    0
 .../{ => broadcom}/brcm80211/brcmsmac/main.c       |    0
 .../{ => broadcom}/brcm80211/brcmsmac/main.h       |    0
 .../brcm80211/brcmsmac/phy/phy_cmn.c               |    0
 .../brcm80211/brcmsmac/phy/phy_hal.h               |    0
 .../brcm80211/brcmsmac/phy/phy_int.h               |    0
 .../brcm80211/brcmsmac/phy/phy_lcn.c               |    0
 .../brcm80211/brcmsmac/phy/phy_lcn.h               |    0
 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c  |    0
 .../brcm80211/brcmsmac/phy/phy_qmath.c             |    0
 .../brcm80211/brcmsmac/phy/phy_qmath.h             |    0
 .../brcm80211/brcmsmac/phy/phy_radio.h             |    0
 .../brcm80211/brcmsmac/phy/phyreg_n.h              |    0
 .../brcm80211/brcmsmac/phy/phytbl_lcn.c            |    0
 .../brcm80211/brcmsmac/phy/phytbl_lcn.h            |    0
 .../brcm80211/brcmsmac/phy/phytbl_n.c              |    0
 .../brcm80211/brcmsmac/phy/phytbl_n.h              |    0
 .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.c   |    0
 .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.h   |    0
 .../{ => broadcom}/brcm80211/brcmsmac/pmu.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/pmu.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/pub.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/rate.c       |    0
 .../{ => broadcom}/brcm80211/brcmsmac/rate.h       |    0
 .../{ => broadcom}/brcm80211/brcmsmac/scb.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/stf.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/stf.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/types.h      |    0
 .../brcm80211/brcmsmac/ucode_loader.c              |    0
 .../brcm80211/brcmsmac/ucode_loader.h              |    0
 .../{ => broadcom}/brcm80211/brcmutil/Makefile     |    4 +-
 .../{ => broadcom}/brcm80211/brcmutil/d11.c        |    0
 .../{ => broadcom}/brcm80211/brcmutil/utils.c      |    0
 .../{ => broadcom}/brcm80211/include/brcm_hw_ids.h |    0
 .../{ => broadcom}/brcm80211/include/brcmu_d11.h   |    0
 .../{ => broadcom}/brcm80211/include/brcmu_utils.h |    0
 .../{ => broadcom}/brcm80211/include/brcmu_wifi.h  |    0
 .../{ => broadcom}/brcm80211/include/chipcommon.h  |    0
 .../{ => broadcom}/brcm80211/include/defs.h        |    0
 .../{ => broadcom}/brcm80211/include/soc.h         |    0
 drivers/net/wireless/cisco/Kconfig                 |   56 +++++
 drivers/net/wireless/cisco/Makefile                |    2 +
 drivers/net/wireless/{ => cisco}/airo.c            |    0
 drivers/net/wireless/{ => cisco}/airo.h            |    0
 drivers/net/wireless/{ => cisco}/airo_cs.c         |    0
 drivers/net/wireless/intel/Kconfig                 |   18 ++
 drivers/net/wireless/intel/Makefile                |    6 +
 drivers/net/wireless/{ => intel}/ipw2x00/Kconfig   |    0
 drivers/net/wireless/{ => intel}/ipw2x00/Makefile  |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw.h     |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h |    0
 drivers/net/wireless/{ => intel}/ipw2x00/libipw.h  |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_geo.c  |    0
 .../wireless/{ => intel}/ipw2x00/libipw_module.c   |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_rx.c   |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_tx.c   |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_wx.c   |    0
 .../net/wireless/{ => intel}/iwlegacy/3945-debug.c |    0
 .../net/wireless/{ => intel}/iwlegacy/3945-mac.c   |    0
 .../net/wireless/{ => intel}/iwlegacy/3945-rs.c    |    0
 drivers/net/wireless/{ => intel}/iwlegacy/3945.c   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/3945.h   |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-calib.c |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-debug.c |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-mac.c   |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-rs.c    |    0
 drivers/net/wireless/{ => intel}/iwlegacy/4965.c   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/4965.h   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/Kconfig  |    0
 drivers/net/wireless/{ => intel}/iwlegacy/Makefile |    0
 .../net/wireless/{ => intel}/iwlegacy/commands.h   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/common.c |    0
 drivers/net/wireless/{ => intel}/iwlegacy/common.h |    0
 drivers/net/wireless/{ => intel}/iwlegacy/csr.h    |    0
 drivers/net/wireless/{ => intel}/iwlegacy/debug.c  |    0
 .../wireless/{ => intel}/iwlegacy/iwl-spectrum.h   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/prph.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/Kconfig   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/Makefile  |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/Makefile  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/calib.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/calib.h   |    0
 .../wireless/{ => intel}/iwlwifi/dvm/commands.h    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/devices.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c |    0
 .../wireless/{ => intel}/iwlwifi/dvm/mac80211.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/main.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/power.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/power.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/rxon.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/scan.c    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/ucode.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-1000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-2000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-5000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-6000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-7000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-8000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h  |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-config.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-debug.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-debug.h   |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-data.h        |    0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h     |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-msg.h         |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-ucode.h       |    0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace.c    |    0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace.h    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h |    0
 .../{ => intel}/iwlwifi/iwl-eeprom-parse.c         |    0
 .../{ => intel}/iwlwifi/iwl-eeprom-parse.h         |    0
 .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c |    0
 .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h  |    0
 .../{ => intel}/iwlwifi/iwl-fw-error-dump.h        |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h  |    0
 .../wireless/{ => intel}/iwlwifi/iwl-modparams.h   |    0
 .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.c  |    0
 .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.h  |    0
 .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c   |    0
 .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h  |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-prph.h    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-trans.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-trans.h   |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/Makefile  |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/binding.c |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/coex.c    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/constants.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c  |    0
 .../wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h   |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h  |    0
 .../{ => intel}/iwlwifi/mvm/fw-api-power.h         |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h   |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h   |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h  |    0
 .../{ => intel}/iwlwifi/mvm/fw-api-stats.h         |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h  |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h   |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/mac80211.c    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/offloading.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/power.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/quota.c   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/scan.c    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/tdls.c    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/testmode.h    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/time-event.c  |    0
 .../wireless/{ => intel}/iwlwifi/mvm/time-event.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/utils.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/pcie/drv.c    |    0
 .../wireless/{ => intel}/iwlwifi/pcie/internal.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c |    0
 .../net/wireless/{ => intel}/iwlwifi/pcie/trans.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c |    0
 drivers/net/wireless/intersil/Kconfig              |   38 ++++
 drivers/net/wireless/intersil/Makefile             |    4 +
 drivers/net/wireless/{ => intersil}/hostap/Kconfig |    0
 .../net/wireless/{ => intersil}/hostap/Makefile    |    0
 .../net/wireless/{ => intersil}/hostap/hostap.h    |    0
 .../wireless/{ => intersil}/hostap/hostap_80211.h  |    0
 .../{ => intersil}/hostap/hostap_80211_rx.c        |    0
 .../{ => intersil}/hostap/hostap_80211_tx.c        |    0
 .../net/wireless/{ => intersil}/hostap/hostap_ap.c |    0
 .../net/wireless/{ => intersil}/hostap/hostap_ap.h |    0
 .../wireless/{ => intersil}/hostap/hostap_common.h |    0
 .../wireless/{ => intersil}/hostap/hostap_config.h |    0
 .../net/wireless/{ => intersil}/hostap/hostap_cs.c |    0
 .../{ => intersil}/hostap/hostap_download.c        |    0
 .../net/wireless/{ => intersil}/hostap/hostap_hw.c |    0
 .../wireless/{ => intersil}/hostap/hostap_info.c   |    0
 .../wireless/{ => intersil}/hostap/hostap_ioctl.c  |    0
 .../wireless/{ => intersil}/hostap/hostap_main.c   |    0
 .../wireless/{ => intersil}/hostap/hostap_pci.c    |    0
 .../wireless/{ => intersil}/hostap/hostap_plx.c    |    0
 .../wireless/{ => intersil}/hostap/hostap_proc.c   |    0
 .../wireless/{ => intersil}/hostap/hostap_wlan.h   |    0
 .../net/wireless/{ => intersil}/orinoco/Kconfig    |    0
 .../net/wireless/{ => intersil}/orinoco/Makefile   |    0
 .../net/wireless/{ => intersil}/orinoco/airport.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/cfg.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/cfg.h  |    0
 drivers/net/wireless/{ => intersil}/orinoco/fw.c   |    0
 drivers/net/wireless/{ => intersil}/orinoco/fw.h   |    0
 .../net/wireless/{ => intersil}/orinoco/hermes.c   |    0
 .../net/wireless/{ => intersil}/orinoco/hermes.h   |    0
 .../wireless/{ => intersil}/orinoco/hermes_dld.c   |    0
 .../wireless/{ => intersil}/orinoco/hermes_dld.h   |    0
 .../wireless/{ => intersil}/orinoco/hermes_rid.h   |    0
 drivers/net/wireless/{ => intersil}/orinoco/hw.c   |    0
 drivers/net/wireless/{ => intersil}/orinoco/hw.h   |    0
 drivers/net/wireless/{ => intersil}/orinoco/main.c |    0
 drivers/net/wireless/{ => intersil}/orinoco/main.h |    0
 drivers/net/wireless/{ => intersil}/orinoco/mic.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/mic.h  |    0
 .../net/wireless/{ => intersil}/orinoco/orinoco.h  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_cs.c   |    0
 .../{ => intersil}/orinoco/orinoco_nortel.c        |    0
 .../wireless/{ => intersil}/orinoco/orinoco_pci.c  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_pci.h  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_plx.c  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_tmd.c  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_usb.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/scan.c |    0
 drivers/net/wireless/{ => intersil}/orinoco/scan.h |    0
 .../wireless/{ => intersil}/orinoco/spectrum_cs.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/wext.c |    0
 drivers/net/wireless/{ => intersil}/orinoco/wext.h |    0
 drivers/net/wireless/{ => intersil}/p54/Kconfig    |    0
 drivers/net/wireless/{ => intersil}/p54/Makefile   |    0
 drivers/net/wireless/{ => intersil}/p54/eeprom.c   |    0
 drivers/net/wireless/{ => intersil}/p54/eeprom.h   |    0
 drivers/net/wireless/{ => intersil}/p54/fwio.c     |    0
 drivers/net/wireless/{ => intersil}/p54/led.c      |    0
 drivers/net/wireless/{ => intersil}/p54/lmac.h     |    0
 drivers/net/wireless/{ => intersil}/p54/main.c     |    0
 drivers/net/wireless/{ => intersil}/p54/p54.h      |    0
 drivers/net/wireless/{ => intersil}/p54/p54pci.c   |    0
 drivers/net/wireless/{ => intersil}/p54/p54pci.h   |    0
 drivers/net/wireless/{ => intersil}/p54/p54spi.c   |    0
 drivers/net/wireless/{ => intersil}/p54/p54spi.h   |    0
 .../wireless/{ => intersil}/p54/p54spi_eeprom.h    |    0
 drivers/net/wireless/{ => intersil}/p54/p54usb.c   |    0
 drivers/net/wireless/{ => intersil}/p54/p54usb.h   |    0
 drivers/net/wireless/{ => intersil}/p54/txrx.c     |    0
 .../net/wireless/{ => intersil}/prism54/Makefile   |    0
 .../net/wireless/{ => intersil}/prism54/isl_38xx.c |    0
 .../net/wireless/{ => intersil}/prism54/isl_38xx.h |    0
 .../wireless/{ => intersil}/prism54/isl_ioctl.c    |    0
 .../wireless/{ => intersil}/prism54/isl_ioctl.h    |    0
 .../net/wireless/{ => intersil}/prism54/isl_oid.h  |    0
 .../wireless/{ => intersil}/prism54/islpci_dev.c   |    0
 .../wireless/{ => intersil}/prism54/islpci_dev.h   |    0
 .../wireless/{ => intersil}/prism54/islpci_eth.c   |    0
 .../wireless/{ => intersil}/prism54/islpci_eth.h   |    0
 .../{ => intersil}/prism54/islpci_hotplug.c        |    0
 .../wireless/{ => intersil}/prism54/islpci_mgt.c   |    0
 .../wireless/{ => intersil}/prism54/islpci_mgt.h   |    0
 .../net/wireless/{ => intersil}/prism54/oid_mgt.c  |    0
 .../net/wireless/{ => intersil}/prism54/oid_mgt.h  |    0
 .../wireless/{ => intersil}/prism54/prismcompat.h  |    0
 drivers/net/wireless/marvell/Kconfig               |   27 +++
 drivers/net/wireless/marvell/Makefile              |    6 +
 .../net/wireless/{ => marvell}/libertas/Kconfig    |    0
 .../net/wireless/{ => marvell}/libertas/LICENSE    |    0
 .../net/wireless/{ => marvell}/libertas/Makefile   |    0
 drivers/net/wireless/{ => marvell}/libertas/README |    0
 drivers/net/wireless/{ => marvell}/libertas/cfg.c  |    0
 drivers/net/wireless/{ => marvell}/libertas/cfg.h  |    0
 drivers/net/wireless/{ => marvell}/libertas/cmd.c  |    0
 drivers/net/wireless/{ => marvell}/libertas/cmd.h  |    0
 .../net/wireless/{ => marvell}/libertas/cmdresp.c  |    0
 .../net/wireless/{ => marvell}/libertas/debugfs.c  |    0
 .../net/wireless/{ => marvell}/libertas/debugfs.h  |    0
 drivers/net/wireless/{ => marvell}/libertas/decl.h |    0
 drivers/net/wireless/{ => marvell}/libertas/defs.h |    0
 drivers/net/wireless/{ => marvell}/libertas/dev.h  |    0
 .../net/wireless/{ => marvell}/libertas/ethtool.c  |    0
 .../net/wireless/{ => marvell}/libertas/firmware.c |    0
 drivers/net/wireless/{ => marvell}/libertas/host.h |    0
 .../net/wireless/{ => marvell}/libertas/if_cs.c    |    0
 .../net/wireless/{ => marvell}/libertas/if_sdio.c  |    0
 .../net/wireless/{ => marvell}/libertas/if_sdio.h  |    0
 .../net/wireless/{ => marvell}/libertas/if_spi.c   |    0
 .../net/wireless/{ => marvell}/libertas/if_spi.h   |    0
 .../net/wireless/{ => marvell}/libertas/if_usb.c   |    0
 .../net/wireless/{ => marvell}/libertas/if_usb.h   |    0
 drivers/net/wireless/{ => marvell}/libertas/main.c |    0
 drivers/net/wireless/{ => marvell}/libertas/mesh.c |    0
 drivers/net/wireless/{ => marvell}/libertas/mesh.h |    0
 .../net/wireless/{ => marvell}/libertas/radiotap.h |    0
 drivers/net/wireless/{ => marvell}/libertas/rx.c   |    0
 drivers/net/wireless/{ => marvell}/libertas/tx.c   |    0
 .../net/wireless/{ => marvell}/libertas/types.h    |    0
 drivers/net/wireless/marvell/libertas_tf/Kconfig   |   18 ++
 .../wireless/{ => marvell}/libertas_tf/Makefile    |    0
 .../net/wireless/{ => marvell}/libertas_tf/cmd.c   |    0
 .../wireless/{ => marvell}/libertas_tf/deb_defs.h  |    0
 .../wireless/{ => marvell}/libertas_tf/if_usb.c    |    0
 .../wireless/{ => marvell}/libertas_tf/if_usb.h    |    0
 .../{ => marvell}/libertas_tf/libertas_tf.h        |    0
 .../net/wireless/{ => marvell}/libertas_tf/main.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11ac.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11ac.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11h.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11n.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11n.h   |    0
 .../net/wireless/{ => marvell}/mwifiex/11n_aggr.c  |    0
 .../net/wireless/{ => marvell}/mwifiex/11n_aggr.h  |    0
 .../wireless/{ => marvell}/mwifiex/11n_rxreorder.c |    0
 .../wireless/{ => marvell}/mwifiex/11n_rxreorder.h |    0
 drivers/net/wireless/{ => marvell}/mwifiex/Kconfig |    0
 .../net/wireless/{ => marvell}/mwifiex/Makefile    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/README  |    0
 .../net/wireless/{ => marvell}/mwifiex/cfg80211.c  |    0
 .../net/wireless/{ => marvell}/mwifiex/cfg80211.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/cfp.c   |    0
 .../net/wireless/{ => marvell}/mwifiex/cmdevt.c    |    0
 .../net/wireless/{ => marvell}/mwifiex/debugfs.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/decl.h  |    0
 .../net/wireless/{ => marvell}/mwifiex/ethtool.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/fw.h    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/ie.c    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/init.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h |    0
 drivers/net/wireless/{ => marvell}/mwifiex/join.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/main.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/main.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/pcie.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/pcie.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/scan.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/sdio.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/sdio.h  |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_cmd.c   |    0
 .../wireless/{ => marvell}/mwifiex/sta_cmdresp.c   |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_event.c |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_ioctl.c |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_rx.c    |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_tx.c    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/tdls.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/txrx.c  |    0
 .../net/wireless/{ => marvell}/mwifiex/uap_cmd.c   |    0
 .../net/wireless/{ => marvell}/mwifiex/uap_event.c |    0
 .../net/wireless/{ => marvell}/mwifiex/uap_txrx.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/usb.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/usb.h   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/util.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/util.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/wmm.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/wmm.h   |    0
 drivers/net/wireless/{ => marvell}/mwl8k.c         |    0
 drivers/net/wireless/mediatek/Kconfig              |   16 +-
 drivers/net/wireless/ralink/Kconfig                |   16 ++
 drivers/net/wireless/ralink/Makefile               |    1 +
 drivers/net/wireless/{ => ralink}/rt2x00/Kconfig   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/Makefile  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2400pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2400pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500usb.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500usb.h   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800soc.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800usb.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800usb.h   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h  |    0
 .../wireless/{ => ralink}/rt2x00/rt2x00config.c    |    0
 .../wireless/{ => ralink}/rt2x00/rt2x00crypto.c    |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.c |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.h |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00dev.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00dump.h  |    0
 .../wireless/{ => ralink}/rt2x00/rt2x00firmware.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00lib.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00link.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mac.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.c |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.h |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00reg.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.h   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h |    0
 drivers/net/wireless/realtek/Kconfig               |   18 ++
 drivers/net/wireless/rsi/Kconfig                   |   15 ++
 drivers/net/wireless/st/Kconfig                    |   16 ++
 drivers/net/wireless/st/Makefile                   |    1 +
 drivers/net/wireless/{ => st}/cw1200/Kconfig       |    0
 drivers/net/wireless/{ => st}/cw1200/Makefile      |    0
 drivers/net/wireless/{ => st}/cw1200/bh.c          |    0
 drivers/net/wireless/{ => st}/cw1200/bh.h          |    0
 drivers/net/wireless/{ => st}/cw1200/cw1200.h      |    0
 drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c |    0
 drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c  |    0
 drivers/net/wireless/{ => st}/cw1200/debug.c       |    0
 drivers/net/wireless/{ => st}/cw1200/debug.h       |    0
 drivers/net/wireless/{ => st}/cw1200/fwio.c        |    0
 drivers/net/wireless/{ => st}/cw1200/fwio.h        |    0
 drivers/net/wireless/{ => st}/cw1200/hwbus.h       |    0
 drivers/net/wireless/{ => st}/cw1200/hwio.c        |    0
 drivers/net/wireless/{ => st}/cw1200/hwio.h        |    0
 drivers/net/wireless/{ => st}/cw1200/main.c        |    0
 drivers/net/wireless/{ => st}/cw1200/pm.c          |    0
 drivers/net/wireless/{ => st}/cw1200/pm.h          |    0
 drivers/net/wireless/{ => st}/cw1200/queue.c       |    0
 drivers/net/wireless/{ => st}/cw1200/queue.h       |    0
 drivers/net/wireless/{ => st}/cw1200/scan.c        |    0
 drivers/net/wireless/{ => st}/cw1200/scan.h        |    0
 drivers/net/wireless/{ => st}/cw1200/sta.c         |    0
 drivers/net/wireless/{ => st}/cw1200/sta.h         |    0
 drivers/net/wireless/{ => st}/cw1200/txrx.c        |    0
 drivers/net/wireless/{ => st}/cw1200/txrx.h        |    0
 drivers/net/wireless/{ => st}/cw1200/wsm.c         |    0
 drivers/net/wireless/{ => st}/cw1200/wsm.h         |    0
 drivers/net/wireless/ti/Kconfig                    |   18 +-
 drivers/net/wireless/ti/wl1251/Kconfig             |    2 +-
 drivers/net/wireless/ti/wlcore/Kconfig             |    2 +-
 drivers/net/wireless/zydas/Kconfig                 |   35 +++
 drivers/net/wireless/zydas/Makefile                |    3 +
 drivers/net/wireless/{ => zydas}/zd1201.c          |    0
 drivers/net/wireless/{ => zydas}/zd1201.h          |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig  |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/Makefile |    0
 .../net/wireless/{ => zydas}/zd1211rw/zd_chip.c    |    0
 .../net/wireless/{ => zydas}/zd1211rw/zd_chip.h    |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c  |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h  |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c   |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c  |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c   |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c   |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h |    0
 660 files changed, 511 insertions(+), 314 deletions(-)
 create mode 100644 drivers/net/wireless/admtek/Kconfig
 create mode 100644 drivers/net/wireless/admtek/Makefile
 rename drivers/net/wireless/{ => admtek}/adm8211.c (100%)
 rename drivers/net/wireless/{ => admtek}/adm8211.h (100%)
 create mode 100644 drivers/net/wireless/atmel/Kconfig
 create mode 100644 drivers/net/wireless/atmel/Makefile
 rename drivers/net/wireless/{ => atmel}/at76c50x-usb.c (100%)
 rename drivers/net/wireless/{ => atmel}/at76c50x-usb.h (100%)
 rename drivers/net/wireless/{ => atmel}/atmel.c (100%)
 rename drivers/net/wireless/{ => atmel}/atmel.h (100%)
 rename drivers/net/wireless/{ => atmel}/atmel_cs.c (100%)
 rename drivers/net/wireless/{ => atmel}/atmel_pci.c (100%)
 create mode 100644 drivers/net/wireless/broadcom/Kconfig
 create mode 100644 drivers/net/wireless/broadcom/Makefile
 rename drivers/net/wireless/{ => broadcom}/b43/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/b43.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/bus.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/bus.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/debugfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/debugfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/leds.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/leds.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/lo.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/lo.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_a.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_a.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_common.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_common.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_g.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_g.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_n.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_n.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/pio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/pio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/ppr.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/ppr.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/rfkill.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/rfkill.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sdio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sdio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sysfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sysfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/wa.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/wa.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/xmit.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/xmit.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/b43legacy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/Makefile (93%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bus.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil_types.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/Makefile (88%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/d11.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_cmn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_hal.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_int.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_radio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phyreg_n.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pub.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/scb.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/types.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/Makefile (89%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/d11.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/utils.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcm_hw_ids.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_d11.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_utils.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_wifi.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/chipcommon.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/defs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/soc.h (100%)
 create mode 100644 drivers/net/wireless/cisco/Kconfig
 create mode 100644 drivers/net/wireless/cisco/Makefile
 rename drivers/net/wireless/{ => cisco}/airo.c (100%)
 rename drivers/net/wireless/{ => cisco}/airo.h (100%)
 rename drivers/net/wireless/{ => cisco}/airo_cs.c (100%)
 create mode 100644 drivers/net/wireless/intel/Kconfig
 create mode 100644 drivers/net/wireless/intel/Makefile
 rename drivers/net/wireless/{ => intel}/ipw2x00/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_geo.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_module.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_rx.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_tx.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_wx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-mac.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-calib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-mac.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/commands.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/common.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/common.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/csr.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/iwl-spectrum.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/prph.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/commands.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/devices.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/mac80211.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/main.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rxon.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/scan.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/ucode.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-1000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-2000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-5000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-6000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-7000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-8000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-config.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-data.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-msg.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-ucode.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-error-dump.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-modparams.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-prph.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/binding.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/constants.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-power.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-stats.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac80211.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/offloading.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/power.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/quota.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/scan.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tdls.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/testmode.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/utils.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/drv.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/internal.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/trans.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c (100%)
 create mode 100644 drivers/net/wireless/intersil/Kconfig
 create mode 100644 drivers/net/wireless/intersil/Makefile
 rename drivers/net/wireless/{ => intersil}/hostap/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_rx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_tx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_common.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_config.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_download.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_hw.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_info.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ioctl.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_main.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_plx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_proc.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_wlan.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/airport.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/cfg.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/cfg.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/fw.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/fw.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_rid.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hw.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hw.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/main.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/main.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/mic.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/mic.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_nortel.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_plx.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_tmd.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_usb.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/scan.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/scan.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/spectrum_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/wext.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/wext.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/p54/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/p54/eeprom.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/eeprom.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/fwio.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/led.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/lmac.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/main.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54pci.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54spi.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54spi.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54spi_eeprom.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54usb.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54usb.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/txrx.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_oid.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_hotplug.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/prismcompat.h (100%)
 create mode 100644 drivers/net/wireless/marvell/Kconfig
 create mode 100644 drivers/net/wireless/marvell/Makefile
 rename drivers/net/wireless/{ => marvell}/libertas/Kconfig (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/LICENSE (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/README (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cfg.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cfg.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmd.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmdresp.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/debugfs.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/debugfs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/decl.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/defs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/dev.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/ethtool.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/firmware.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/host.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_cs.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_spi.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_spi.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/main.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/mesh.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/mesh.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/radiotap.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/rx.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/tx.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/types.h (100%)
 create mode 100644 drivers/net/wireless/marvell/libertas_tf/Kconfig
 rename drivers/net/wireless/{ => marvell}/libertas_tf/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/deb_defs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/libertas_tf.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/main.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11h.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/Kconfig (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/README (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfp.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cmdevt.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/debugfs.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/decl.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ethtool.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/fw.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ie.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/init.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/join.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/main.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/main.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/scan.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmdresp.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_event.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_ioctl.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_rx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_tx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/tdls.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/txrx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/uap_cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/uap_event.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/uap_txrx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/util.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/util.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwl8k.c (100%)
 create mode 100644 drivers/net/wireless/ralink/Kconfig
 create mode 100644 drivers/net/wireless/ralink/Makefile
 rename drivers/net/wireless/{ => ralink}/rt2x00/Kconfig (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/Makefile (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800soc.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00config.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00crypto.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dev.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dump.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00firmware.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00lib.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00link.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mac.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00reg.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h (100%)
 create mode 100644 drivers/net/wireless/realtek/Kconfig
 create mode 100644 drivers/net/wireless/st/Kconfig
 create mode 100644 drivers/net/wireless/st/Makefile
 rename drivers/net/wireless/{ => st}/cw1200/Kconfig (100%)
 rename drivers/net/wireless/{ => st}/cw1200/Makefile (100%)
 rename drivers/net/wireless/{ => st}/cw1200/bh.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/bh.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/debug.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/debug.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/fwio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/fwio.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwbus.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwio.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/main.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/pm.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/pm.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/queue.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/queue.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/scan.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/scan.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/sta.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/sta.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/txrx.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/txrx.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/wsm.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/wsm.h (100%)
 create mode 100644 drivers/net/wireless/zydas/Kconfig
 create mode 100644 drivers/net/wireless/zydas/Makefile
 rename drivers/net/wireless/{ => zydas}/zd1201.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1201.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/Makefile (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h (100%)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v2 1/27 adm80211: move under admtek vendor directory

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                 |    2 +-
 drivers/net/wireless/Kconfig                |   29 ++-----------------
 drivers/net/wireless/Makefile               |    4 +--
 drivers/net/wireless/admtek/Kconfig         |   41 +++++++++++++++++++++++++++
 drivers/net/wireless/admtek/Makefile        |    1 +
 drivers/net/wireless/{ => admtek}/adm8211.c |    0
 drivers/net/wireless/{ => admtek}/adm8211.h |    0
 7 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 drivers/net/wireless/admtek/Kconfig
 create mode 100644 drivers/net/wireless/admtek/Makefile
 rename drivers/net/wireless/{ => admtek}/adm8211.c (100%)
 rename drivers/net/wireless/{ => admtek}/adm8211.h (100%)
MAINTAINERS +1 -1
index 35fe7ae0492e..f1adb66094f1 100644
@@ -388,7 +388,7 @@ ADM8211 WIRELESS DRIVER
 L:	[email protected]
 W:	http://wireless.kernel.org/
 S:	Orphan
-F:	drivers/net/wireless/adm8211.*
+F:	drivers/net/wireless/admtek/adm8211.*
 
 ADP1653 FLASH CONTROLLER DRIVER
 M:	Sakari Ailus <[email protected]>
drivers/net/wireless/Kconfig +2 -27
index f9f94229bf1b..7d8f47117c4d 100644
@@ -17,6 +17,8 @@ menuconfig WLAN
 
 if WLAN
 
+source "drivers/net/wireless/admtek/Kconfig"
+
 config PCMCIA_RAYCS
 	tristate "Aviator/Raytheon 2.4GHz wireless support"
 	depends on PCMCIA
@@ -214,33 +216,6 @@ config USB_NET_RNDIS_WLAN
 
 	  If you choose to build a module, it'll be called rndis_wlan.
 
-config ADM8211
-	tristate "ADMtek ADM8211 support"
-	depends on MAC80211 && PCI
-	select CRC32
-	select EEPROM_93CX6
-	---help---
-	  This driver is for ADM8211A, ADM8211B, and ADM8211C based cards.
-	  These are PCI/mini-PCI/Cardbus 802.11b chips found in cards such as:
-
-	  Xterasys Cardbus XN-2411b
-	  Blitz NetWave Point PC
-	  TrendNet 221pc
-	  Belkin F5D6001
-	  SMC 2635W
-	  Linksys WPC11 v1
-	  Fiberline FL-WL-200X
-	  3com Office Connect (3CRSHPW796)
-	  Corega WLPCIB-11
-	  SMC 2602W V2 EU
-	  D-Link DWL-520 Revision C
-
-	  However, some of these cards have been replaced with other chips
-	  like the RTL8180L (Xterasys Cardbus XN-2411b, Belkin F5D6001) or
-	  the Ralink RT2400 (SMC2635W) without a model number change.
-
-	  Thanks to Infineon-ADMtek for their support of this driver.
-
 source "drivers/net/wireless/realtek/rtl818x/Kconfig"
 
 config MAC80211_HWSIM
drivers/net/wireless/Makefile +2 -2
index 740fdd353c5d..be215f43ec1d 100644
@@ -2,6 +2,8 @@
 # Makefile for the Linux Wireless network device drivers.
 #
 
+obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
+
 obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
 
@@ -35,8 +37,6 @@ obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
 
-obj-$(CONFIG_ADM8211)	+= adm8211.o
-
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 
 obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
drivers/net/wireless/admtek/Kconfig new file +41 -0

41 lines not on this page · raw message

drivers/net/wireless/admtek/Makefile new file +1 -0
new file mode 100644
index 000000000000..9cca7e571cdd
@@ -0,0 +1 @@
+obj-$(CONFIG_ADM8211)	+= adm8211.o
drivers/net/wireless/admtek/adm8211.c renamed from drivers/net/wireless/adm8211.c +0 -0
similarity index 100%
rename from drivers/net/wireless/adm8211.c
rename to drivers/net/wireless/admtek/adm8211.c
drivers/net/wireless/admtek/adm8211.h renamed from drivers/net/wireless/adm8211.h +0 -0
similarity index 100%
rename from drivers/net/wireless/adm8211.h
rename to drivers/net/wireless/admtek/adm8211.h
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH v2 2/27 airo: move under cisco vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 drivers/net/wireless/Kconfig               |   43 +--------------------
 drivers/net/wireless/Makefile              |    4 +-
 drivers/net/wireless/cisco/Kconfig         |   56 ++++++++++++++++++++++++++++
 drivers/net/wireless/cisco/Makefile        |    2 +
 drivers/net/wireless/{ => cisco}/airo.c    |    0
 drivers/net/wireless/{ => cisco}/airo.h    |    0
 drivers/net/wireless/{ => cisco}/airo_cs.c |    0
 7 files changed, 60 insertions(+), 45 deletions(-)
 create mode 100644 drivers/net/wireless/cisco/Kconfig
 create mode 100644 drivers/net/wireless/cisco/Makefile
 rename drivers/net/wireless/{ => cisco}/airo.c (100%)
 rename drivers/net/wireless/{ => cisco}/airo.h (100%)
 rename drivers/net/wireless/{ => cisco}/airo_cs.c (100%)
drivers/net/wireless/Kconfig +1 -42
index 7d8f47117c4d..ce5211ba1b29 100644
@@ -18,6 +18,7 @@ menuconfig WLAN
 if WLAN
 
 source "drivers/net/wireless/admtek/Kconfig"
+source "drivers/net/wireless/cisco/Kconfig"
 
 config PCMCIA_RAYCS
 	tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -53,26 +54,6 @@ config LIBERTAS_THINFIRM_USB
 	---help---
 	  A driver for Marvell Libertas 8388 USB devices using thinfirm.
 
-config AIRO
-	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
-	depends on CFG80211 && ISA_DMA_API && (PCI || BROKEN)
-	select WIRELESS_EXT
-	select CRYPTO
-	select WEXT_SPY
-	select WEXT_PRIV
-	---help---
-	  This is the standard Linux driver to support Cisco/Aironet ISA and
-	  PCI 802.11 wireless cards.
-	  It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
-	  - with or without encryption) as well as card before the Cisco
-	  acquisition (Aironet 4500, Aironet 4800, Aironet 4800B).
-
-	  This driver support both the standard Linux Wireless Extensions
-	  and Cisco proprietary API, so both the Linux Wireless Tools and the
-	  Cisco Linux utilities can be used to configure the card.
-
-	  The driver can be compiled as a module and will be named "airo".
-
 config ATMEL
       tristate "Atmel at76c50x chipset  802.11b support"
       depends on CFG80211 && (PCI || PCMCIA)
@@ -116,28 +97,6 @@ config AT76C50X_USB
           Enable support for USB Wireless devices using Atmel at76c503,
           at76c505 or at76c505a chips.
 
-config AIRO_CS
-	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
-	depends on CFG80211 && PCMCIA && (BROKEN || !M32R)
-	select WIRELESS_EXT
-	select WEXT_SPY
-	select WEXT_PRIV
-	select CRYPTO
-	select CRYPTO_AES
-	---help---
-	  This is the standard Linux driver to support Cisco/Aironet PCMCIA
-	  802.11 wireless cards.  This driver is the same as the Aironet
-	  driver part of the Linux Pcmcia package.
-	  It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
-	  - with or without encryption) as well as card before the Cisco
-	  acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also
-	  supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom
-	  802.11b cards.
-
-	  This driver support both the standard Linux Wireless Extensions
-	  and Cisco proprietary API, so both the Linux Wireless Tools and the
-	  Cisco Linux utilities can be used to configure the card.
-
 config PCMCIA_WL3501
 	tristate "Planet WL3501 PCMCIA cards"
 	depends on CFG80211 && PCMCIA
drivers/net/wireless/Makefile +1 -3
index be215f43ec1d..853294d84fa9 100644
@@ -3,15 +3,13 @@
 #
 
 obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
+obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 
 obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
 
 obj-$(CONFIG_HERMES)		+= orinoco/
 
-obj-$(CONFIG_AIRO)		+= airo.o
-obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o
-
 obj-$(CONFIG_ATMEL)             += atmel.o
 obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
 obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
drivers/net/wireless/cisco/Kconfig new file +56 -0

56 lines not on this page · raw message

drivers/net/wireless/cisco/Makefile new file +2 -0
new file mode 100644
index 000000000000..d4110b19d6ef
@@ -0,0 +1,2 @@
+obj-$(CONFIG_AIRO)		+= airo.o
+obj-$(CONFIG_AIRO_CS)		+= airo_cs.o airo.o
drivers/net/wireless/cisco/airo.c renamed from drivers/net/wireless/airo.c +0 -0
similarity index 100%
rename from drivers/net/wireless/airo.c
rename to drivers/net/wireless/cisco/airo.c
drivers/net/wireless/cisco/airo.h renamed from drivers/net/wireless/airo.h +0 -0
similarity index 100%
rename from drivers/net/wireless/airo.h
rename to drivers/net/wireless/cisco/airo.h
drivers/net/wireless/cisco/airo_cs.c renamed from drivers/net/wireless/airo_cs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/airo_cs.c
rename to drivers/net/wireless/cisco/airo_cs.c
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH v2 3/27 atmel: move under atmel vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                     |    2 +-
 drivers/net/wireless/Kconfig                    |   44 +----------------
 drivers/net/wireless/Makefile                   |    7 +--
 drivers/net/wireless/atmel/Kconfig              |   57 +++++++++++++++++++++++
 drivers/net/wireless/atmel/Makefile             |    5 ++
 drivers/net/wireless/{ => atmel}/at76c50x-usb.c |    0
 drivers/net/wireless/{ => atmel}/at76c50x-usb.h |    0
 drivers/net/wireless/{ => atmel}/atmel.c        |    0
 drivers/net/wireless/{ => atmel}/atmel.h        |    0
 drivers/net/wireless/{ => atmel}/atmel_cs.c     |    0
 drivers/net/wireless/{ => atmel}/atmel_pci.c    |    0
 11 files changed, 65 insertions(+), 50 deletions(-)
 create mode 100644 drivers/net/wireless/atmel/Kconfig
 create mode 100644 drivers/net/wireless/atmel/Makefile
 rename drivers/net/wireless/{ => atmel}/at76c50x-usb.c (100%)
 rename drivers/net/wireless/{ => atmel}/at76c50x-usb.h (100%)
 rename drivers/net/wireless/{ => atmel}/atmel.c (100%)
 rename drivers/net/wireless/{ => atmel}/atmel.h (100%)
 rename drivers/net/wireless/{ => atmel}/atmel_cs.c (100%)
 rename drivers/net/wireless/{ => atmel}/atmel_pci.c (100%)
MAINTAINERS +1 -1
index f1adb66094f1..2f3ea01c101c 100644
@@ -1992,7 +1992,7 @@ L:	[email protected]
 W:	http://www.thekelleys.org.uk/atmel
 W:	http://atmelwlandriver.sourceforge.net/
 S:	Maintained
-F:	drivers/net/wireless/atmel*
+F:	drivers/net/wireless/atmel/atmel*
 
 ATMEL MAXTOUCH DRIVER
 M:	Nick Dyer <[email protected]>
drivers/net/wireless/Kconfig +1 -43

56 lines not on this page · raw message

drivers/net/wireless/Makefile +1 -6
index 853294d84fa9..87eb6b2f3227 100644
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
+obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 
 obj-$(CONFIG_IPW2100) += ipw2x00/
@@ -10,12 +11,6 @@ obj-$(CONFIG_IPW2200) += ipw2x00/
 
 obj-$(CONFIG_HERMES)		+= orinoco/
 
-obj-$(CONFIG_ATMEL)             += atmel.o
-obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
-obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
-
-obj-$(CONFIG_AT76C50X_USB)      += at76c50x-usb.o
-
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
drivers/net/wireless/atmel/Kconfig new file +57 -0

57 lines not on this page · raw message

drivers/net/wireless/atmel/Makefile new file +5 -0
new file mode 100644
index 000000000000..e62e345f7af6
@@ -0,0 +1,5 @@
+obj-$(CONFIG_ATMEL)             += atmel.o
+obj-$(CONFIG_PCI_ATMEL)         += atmel_pci.o 
+obj-$(CONFIG_PCMCIA_ATMEL)      += atmel_cs.o
+
+obj-$(CONFIG_AT76C50X_USB)      += at76c50x-usb.o
drivers/net/wireless/atmel/at76c50x-usb.c renamed from drivers/net/wireless/at76c50x-usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/at76c50x-usb.c
rename to drivers/net/wireless/atmel/at76c50x-usb.c
drivers/net/wireless/atmel/at76c50x-usb.h renamed from drivers/net/wireless/at76c50x-usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/at76c50x-usb.h
rename to drivers/net/wireless/atmel/at76c50x-usb.h
drivers/net/wireless/atmel/atmel.c renamed from drivers/net/wireless/atmel.c +0 -0
similarity index 100%
rename from drivers/net/wireless/atmel.c
rename to drivers/net/wireless/atmel/atmel.c
drivers/net/wireless/atmel/atmel.h renamed from drivers/net/wireless/atmel.h +0 -0
similarity index 100%
rename from drivers/net/wireless/atmel.h
rename to drivers/net/wireless/atmel/atmel.h
drivers/net/wireless/atmel/atmel_cs.c renamed from drivers/net/wireless/atmel_cs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/atmel_cs.c
rename to drivers/net/wireless/atmel/atmel_cs.c
drivers/net/wireless/atmel/atmel_pci.c renamed from drivers/net/wireless/atmel_pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/atmel_pci.c
rename to drivers/net/wireless/atmel/atmel_pci.c
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH v2 4/27 b43: move under broadcom vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    2 +-
 drivers/net/wireless/Makefile                      |    2 +-
 drivers/net/wireless/broadcom/Kconfig              |   16 ++++++++++++++++
 drivers/net/wireless/broadcom/Makefile             |    1 +
 drivers/net/wireless/{ => broadcom}/b43/Kconfig    |    0
 drivers/net/wireless/{ => broadcom}/b43/Makefile   |    0
 drivers/net/wireless/{ => broadcom}/b43/b43.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/bus.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/bus.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/debugfs.c  |    0
 drivers/net/wireless/{ => broadcom}/b43/debugfs.h  |    0
 drivers/net/wireless/{ => broadcom}/b43/dma.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/dma.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/leds.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/leds.h     |    0
 drivers/net/wireless/{ => broadcom}/b43/lo.c       |    0
 drivers/net/wireless/{ => broadcom}/b43/lo.h       |    0
 drivers/net/wireless/{ => broadcom}/b43/main.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/main.h     |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_a.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_a.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ac.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ac.h   |    0
 .../net/wireless/{ => broadcom}/b43/phy_common.c   |    0
 .../net/wireless/{ => broadcom}/b43/phy_common.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_g.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_g.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ht.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_ht.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c  |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h  |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lp.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_lp.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_n.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/phy_n.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/pio.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/pio.h      |    0
 drivers/net/wireless/{ => broadcom}/b43/ppr.c      |    0
 drivers/net/wireless/{ => broadcom}/b43/ppr.h      |    0
 .../net/wireless/{ => broadcom}/b43/radio_2055.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2055.h   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2056.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2056.h   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2057.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2057.h   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2059.c   |    0
 .../net/wireless/{ => broadcom}/b43/radio_2059.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/rfkill.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/rfkill.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/sdio.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/sdio.h     |    0
 drivers/net/wireless/{ => broadcom}/b43/sysfs.c    |    0
 drivers/net/wireless/{ => broadcom}/b43/sysfs.h    |    0
 drivers/net/wireless/{ => broadcom}/b43/tables.c   |    0
 drivers/net/wireless/{ => broadcom}/b43/tables.h   |    0
 .../net/wireless/{ => broadcom}/b43/tables_lpphy.c |    0
 .../net/wireless/{ => broadcom}/b43/tables_lpphy.h |    0
 .../net/wireless/{ => broadcom}/b43/tables_nphy.c  |    0
 .../net/wireless/{ => broadcom}/b43/tables_nphy.h  |    0
 .../wireless/{ => broadcom}/b43/tables_phy_ht.c    |    0
 .../wireless/{ => broadcom}/b43/tables_phy_ht.h    |    0
 .../wireless/{ => broadcom}/b43/tables_phy_lcn.c   |    0
 .../wireless/{ => broadcom}/b43/tables_phy_lcn.h   |    0
 drivers/net/wireless/{ => broadcom}/b43/wa.c       |    0
 drivers/net/wireless/{ => broadcom}/b43/wa.h       |    0
 drivers/net/wireless/{ => broadcom}/b43/xmit.c     |    0
 drivers/net/wireless/{ => broadcom}/b43/xmit.h     |    0
 68 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/broadcom/Kconfig
 create mode 100644 drivers/net/wireless/broadcom/Makefile
 rename drivers/net/wireless/{ => broadcom}/b43/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/b43.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/bus.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/bus.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/debugfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/debugfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/leds.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/leds.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/lo.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/lo.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_a.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_a.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_common.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_common.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_g.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_g.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_n.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/phy_n.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/pio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/pio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/ppr.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/ppr.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/rfkill.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/rfkill.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sdio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sdio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sysfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/sysfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/wa.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/wa.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/xmit.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/xmit.h (100%)
MAINTAINERS +1 -1
index 2f3ea01c101c..68793777fdb5 100644
@@ -2081,7 +2081,7 @@ L:	[email protected]
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/b43
 S:	Odd Fixes
-F:	drivers/net/wireless/b43/
+F:	drivers/net/wireless/broadcom/b43/
 
 B43LEGACY WIRELESS DRIVER
 M:	Larry Finger <[email protected]>
drivers/net/wireless/Kconfig +1 -1
index 275b6ed93f15..0c47f2ca2207 100644
@@ -19,6 +19,7 @@ if WLAN
 
 source "drivers/net/wireless/admtek/Kconfig"
 source "drivers/net/wireless/atmel/Kconfig"
+source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 
 config PCMCIA_RAYCS
@@ -158,7 +159,6 @@ config MWL8K
 	  will be called mwl8k.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/brcm80211/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
drivers/net/wireless/Makefile +1 -1
index 87eb6b2f3227..7907674ad5b4 100644
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
 obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
+obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 
 obj-$(CONFIG_IPW2100) += ipw2x00/
@@ -14,7 +15,6 @@ obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
-obj-$(CONFIG_B43)		+= b43/
 obj-$(CONFIG_B43LEGACY)		+= b43legacy/
 obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
 obj-$(CONFIG_WLAN)		+= realtek/
drivers/net/wireless/broadcom/Kconfig new file +16 -0
new file mode 100644
index 000000000000..0ba8119d2cf2
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_BROADCOM
+	bool "Broadcom devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_BROADCOM
+
+source "drivers/net/wireless/broadcom/b43/Kconfig"
+
+endif # WLAN_VENDOR_BROADCOM
drivers/net/wireless/broadcom/Makefile new file +1 -0
new file mode 100644
index 000000000000..0140a810107c
@@ -0,0 +1 @@
+obj-$(CONFIG_B43)		+= b43/
drivers/net/wireless/broadcom/b43/Kconfig renamed from drivers/net/wireless/b43/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/Kconfig
rename to drivers/net/wireless/broadcom/b43/Kconfig
drivers/net/wireless/broadcom/b43/Makefile renamed from drivers/net/wireless/b43/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/Makefile
rename to drivers/net/wireless/broadcom/b43/Makefile
drivers/net/wireless/broadcom/b43/b43.h renamed from drivers/net/wireless/b43/b43.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/b43.h
rename to drivers/net/wireless/broadcom/b43/b43.h
drivers/net/wireless/broadcom/b43/bus.c renamed from drivers/net/wireless/b43/bus.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/bus.c
rename to drivers/net/wireless/broadcom/b43/bus.c
drivers/net/wireless/broadcom/b43/bus.h renamed from drivers/net/wireless/b43/bus.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/bus.h
rename to drivers/net/wireless/broadcom/b43/bus.h
drivers/net/wireless/broadcom/b43/debugfs.c renamed from drivers/net/wireless/b43/debugfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/debugfs.c
rename to drivers/net/wireless/broadcom/b43/debugfs.c
drivers/net/wireless/broadcom/b43/debugfs.h renamed from drivers/net/wireless/b43/debugfs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/debugfs.h
rename to drivers/net/wireless/broadcom/b43/debugfs.h
drivers/net/wireless/broadcom/b43/dma.c renamed from drivers/net/wireless/b43/dma.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/dma.c
rename to drivers/net/wireless/broadcom/b43/dma.c
drivers/net/wireless/broadcom/b43/dma.h renamed from drivers/net/wireless/b43/dma.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/dma.h
rename to drivers/net/wireless/broadcom/b43/dma.h
drivers/net/wireless/broadcom/b43/leds.c renamed from drivers/net/wireless/b43/leds.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/leds.c
rename to drivers/net/wireless/broadcom/b43/leds.c
drivers/net/wireless/broadcom/b43/leds.h renamed from drivers/net/wireless/b43/leds.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/leds.h
rename to drivers/net/wireless/broadcom/b43/leds.h
drivers/net/wireless/broadcom/b43/lo.c renamed from drivers/net/wireless/b43/lo.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/lo.c
rename to drivers/net/wireless/broadcom/b43/lo.c
drivers/net/wireless/broadcom/b43/lo.h renamed from drivers/net/wireless/b43/lo.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/lo.h
rename to drivers/net/wireless/broadcom/b43/lo.h
drivers/net/wireless/broadcom/b43/main.c renamed from drivers/net/wireless/b43/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/main.c
rename to drivers/net/wireless/broadcom/b43/main.c
drivers/net/wireless/broadcom/b43/main.h renamed from drivers/net/wireless/b43/main.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/main.h
rename to drivers/net/wireless/broadcom/b43/main.h
drivers/net/wireless/broadcom/b43/phy_a.c renamed from drivers/net/wireless/b43/phy_a.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_a.c
rename to drivers/net/wireless/broadcom/b43/phy_a.c
drivers/net/wireless/broadcom/b43/phy_a.h renamed from drivers/net/wireless/b43/phy_a.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_a.h
rename to drivers/net/wireless/broadcom/b43/phy_a.h
drivers/net/wireless/broadcom/b43/phy_ac.c renamed from drivers/net/wireless/b43/phy_ac.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_ac.c
rename to drivers/net/wireless/broadcom/b43/phy_ac.c
drivers/net/wireless/broadcom/b43/phy_ac.h renamed from drivers/net/wireless/b43/phy_ac.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_ac.h
rename to drivers/net/wireless/broadcom/b43/phy_ac.h
drivers/net/wireless/broadcom/b43/phy_common.c renamed from drivers/net/wireless/b43/phy_common.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_common.c
rename to drivers/net/wireless/broadcom/b43/phy_common.c
drivers/net/wireless/broadcom/b43/phy_common.h renamed from drivers/net/wireless/b43/phy_common.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_common.h
rename to drivers/net/wireless/broadcom/b43/phy_common.h
drivers/net/wireless/broadcom/b43/phy_g.c renamed from drivers/net/wireless/b43/phy_g.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_g.c
rename to drivers/net/wireless/broadcom/b43/phy_g.c
drivers/net/wireless/broadcom/b43/phy_g.h renamed from drivers/net/wireless/b43/phy_g.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_g.h
rename to drivers/net/wireless/broadcom/b43/phy_g.h
drivers/net/wireless/broadcom/b43/phy_ht.c renamed from drivers/net/wireless/b43/phy_ht.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_ht.c
rename to drivers/net/wireless/broadcom/b43/phy_ht.c
drivers/net/wireless/broadcom/b43/phy_ht.h renamed from drivers/net/wireless/b43/phy_ht.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_ht.h
rename to drivers/net/wireless/broadcom/b43/phy_ht.h
drivers/net/wireless/broadcom/b43/phy_lcn.c renamed from drivers/net/wireless/b43/phy_lcn.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_lcn.c
rename to drivers/net/wireless/broadcom/b43/phy_lcn.c
drivers/net/wireless/broadcom/b43/phy_lcn.h renamed from drivers/net/wireless/b43/phy_lcn.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_lcn.h
rename to drivers/net/wireless/broadcom/b43/phy_lcn.h
drivers/net/wireless/broadcom/b43/phy_lp.c renamed from drivers/net/wireless/b43/phy_lp.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_lp.c
rename to drivers/net/wireless/broadcom/b43/phy_lp.c
drivers/net/wireless/broadcom/b43/phy_lp.h renamed from drivers/net/wireless/b43/phy_lp.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_lp.h
rename to drivers/net/wireless/broadcom/b43/phy_lp.h
drivers/net/wireless/broadcom/b43/phy_n.c renamed from drivers/net/wireless/b43/phy_n.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_n.c
rename to drivers/net/wireless/broadcom/b43/phy_n.c
drivers/net/wireless/broadcom/b43/phy_n.h renamed from drivers/net/wireless/b43/phy_n.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/phy_n.h
rename to drivers/net/wireless/broadcom/b43/phy_n.h
drivers/net/wireless/broadcom/b43/pio.c renamed from drivers/net/wireless/b43/pio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/pio.c
rename to drivers/net/wireless/broadcom/b43/pio.c
drivers/net/wireless/broadcom/b43/pio.h renamed from drivers/net/wireless/b43/pio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/pio.h
rename to drivers/net/wireless/broadcom/b43/pio.h
drivers/net/wireless/broadcom/b43/ppr.c renamed from drivers/net/wireless/b43/ppr.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/ppr.c
rename to drivers/net/wireless/broadcom/b43/ppr.c
drivers/net/wireless/broadcom/b43/ppr.h renamed from drivers/net/wireless/b43/ppr.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/ppr.h
rename to drivers/net/wireless/broadcom/b43/ppr.h
drivers/net/wireless/broadcom/b43/radio_2055.c renamed from drivers/net/wireless/b43/radio_2055.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2055.c
rename to drivers/net/wireless/broadcom/b43/radio_2055.c
drivers/net/wireless/broadcom/b43/radio_2055.h renamed from drivers/net/wireless/b43/radio_2055.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2055.h
rename to drivers/net/wireless/broadcom/b43/radio_2055.h
drivers/net/wireless/broadcom/b43/radio_2056.c renamed from drivers/net/wireless/b43/radio_2056.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2056.c
rename to drivers/net/wireless/broadcom/b43/radio_2056.c
drivers/net/wireless/broadcom/b43/radio_2056.h renamed from drivers/net/wireless/b43/radio_2056.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2056.h
rename to drivers/net/wireless/broadcom/b43/radio_2056.h
drivers/net/wireless/broadcom/b43/radio_2057.c renamed from drivers/net/wireless/b43/radio_2057.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2057.c
rename to drivers/net/wireless/broadcom/b43/radio_2057.c
drivers/net/wireless/broadcom/b43/radio_2057.h renamed from drivers/net/wireless/b43/radio_2057.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2057.h
rename to drivers/net/wireless/broadcom/b43/radio_2057.h
drivers/net/wireless/broadcom/b43/radio_2059.c renamed from drivers/net/wireless/b43/radio_2059.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2059.c
rename to drivers/net/wireless/broadcom/b43/radio_2059.c
drivers/net/wireless/broadcom/b43/radio_2059.h renamed from drivers/net/wireless/b43/radio_2059.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/radio_2059.h
rename to drivers/net/wireless/broadcom/b43/radio_2059.h
drivers/net/wireless/broadcom/b43/rfkill.c renamed from drivers/net/wireless/b43/rfkill.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/rfkill.c
rename to drivers/net/wireless/broadcom/b43/rfkill.c
drivers/net/wireless/broadcom/b43/rfkill.h renamed from drivers/net/wireless/b43/rfkill.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/rfkill.h
rename to drivers/net/wireless/broadcom/b43/rfkill.h
drivers/net/wireless/broadcom/b43/sdio.c renamed from drivers/net/wireless/b43/sdio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/sdio.c
rename to drivers/net/wireless/broadcom/b43/sdio.c
drivers/net/wireless/broadcom/b43/sdio.h renamed from drivers/net/wireless/b43/sdio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/sdio.h
rename to drivers/net/wireless/broadcom/b43/sdio.h
drivers/net/wireless/broadcom/b43/sysfs.c renamed from drivers/net/wireless/b43/sysfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/sysfs.c
rename to drivers/net/wireless/broadcom/b43/sysfs.c
drivers/net/wireless/broadcom/b43/sysfs.h renamed from drivers/net/wireless/b43/sysfs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/sysfs.h
rename to drivers/net/wireless/broadcom/b43/sysfs.h
drivers/net/wireless/broadcom/b43/tables.c renamed from drivers/net/wireless/b43/tables.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables.c
rename to drivers/net/wireless/broadcom/b43/tables.c
drivers/net/wireless/broadcom/b43/tables.h renamed from drivers/net/wireless/b43/tables.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables.h
rename to drivers/net/wireless/broadcom/b43/tables.h
drivers/net/wireless/broadcom/b43/tables_lpphy.c renamed from drivers/net/wireless/b43/tables_lpphy.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_lpphy.c
rename to drivers/net/wireless/broadcom/b43/tables_lpphy.c
drivers/net/wireless/broadcom/b43/tables_lpphy.h renamed from drivers/net/wireless/b43/tables_lpphy.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_lpphy.h
rename to drivers/net/wireless/broadcom/b43/tables_lpphy.h
drivers/net/wireless/broadcom/b43/tables_nphy.c renamed from drivers/net/wireless/b43/tables_nphy.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_nphy.c
rename to drivers/net/wireless/broadcom/b43/tables_nphy.c
drivers/net/wireless/broadcom/b43/tables_nphy.h renamed from drivers/net/wireless/b43/tables_nphy.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_nphy.h
rename to drivers/net/wireless/broadcom/b43/tables_nphy.h
drivers/net/wireless/broadcom/b43/tables_phy_ht.c renamed from drivers/net/wireless/b43/tables_phy_ht.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_phy_ht.c
rename to drivers/net/wireless/broadcom/b43/tables_phy_ht.c
drivers/net/wireless/broadcom/b43/tables_phy_ht.h renamed from drivers/net/wireless/b43/tables_phy_ht.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_phy_ht.h
rename to drivers/net/wireless/broadcom/b43/tables_phy_ht.h
drivers/net/wireless/broadcom/b43/tables_phy_lcn.c renamed from drivers/net/wireless/b43/tables_phy_lcn.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_phy_lcn.c
rename to drivers/net/wireless/broadcom/b43/tables_phy_lcn.c
drivers/net/wireless/broadcom/b43/tables_phy_lcn.h renamed from drivers/net/wireless/b43/tables_phy_lcn.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/tables_phy_lcn.h
rename to drivers/net/wireless/broadcom/b43/tables_phy_lcn.h
drivers/net/wireless/broadcom/b43/wa.c renamed from drivers/net/wireless/b43/wa.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/wa.c
rename to drivers/net/wireless/broadcom/b43/wa.c
drivers/net/wireless/broadcom/b43/wa.h renamed from drivers/net/wireless/b43/wa.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/wa.h
rename to drivers/net/wireless/broadcom/b43/wa.h
drivers/net/wireless/broadcom/b43/xmit.c renamed from drivers/net/wireless/b43/xmit.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/xmit.c
rename to drivers/net/wireless/broadcom/b43/xmit.c
drivers/net/wireless/broadcom/b43/xmit.h renamed from drivers/net/wireless/b43/xmit.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43/xmit.h
rename to drivers/net/wireless/broadcom/b43/xmit.h
Signature · 1 line
1.7.9.5
author
#5 lore raw

PATCH v2 5/27 b43legacy: move under broadcom vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    1 -
 drivers/net/wireless/broadcom/Kconfig              |    1 +
 drivers/net/wireless/broadcom/Makefile             |    1 +
 .../net/wireless/{ => broadcom}/b43legacy/Kconfig  |    0
 .../net/wireless/{ => broadcom}/b43legacy/Makefile |    0
 .../wireless/{ => broadcom}/b43legacy/b43legacy.h  |    0
 .../wireless/{ => broadcom}/b43legacy/debugfs.c    |    0
 .../wireless/{ => broadcom}/b43legacy/debugfs.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/dma.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/dma.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/ilt.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/ilt.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/leds.c   |    0
 .../net/wireless/{ => broadcom}/b43legacy/leds.h   |    0
 .../net/wireless/{ => broadcom}/b43legacy/main.c   |    0
 .../net/wireless/{ => broadcom}/b43legacy/main.h   |    0
 .../net/wireless/{ => broadcom}/b43legacy/phy.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/phy.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/pio.c    |    0
 .../net/wireless/{ => broadcom}/b43legacy/pio.h    |    0
 .../net/wireless/{ => broadcom}/b43legacy/radio.c  |    0
 .../net/wireless/{ => broadcom}/b43legacy/radio.h  |    0
 .../net/wireless/{ => broadcom}/b43legacy/rfkill.c |    0
 .../net/wireless/{ => broadcom}/b43legacy/rfkill.h |    0
 .../net/wireless/{ => broadcom}/b43legacy/sysfs.c  |    0
 .../net/wireless/{ => broadcom}/b43legacy/sysfs.h  |    0
 .../net/wireless/{ => broadcom}/b43legacy/xmit.c   |    0
 .../net/wireless/{ => broadcom}/b43legacy/xmit.h   |    0
 30 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/b43legacy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.h (100%)
MAINTAINERS +1 -1
index 68793777fdb5..dd20c0b1eb02 100644
@@ -2089,7 +2089,7 @@ L:	[email protected]
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/b43
 S:	Maintained
-F:	drivers/net/wireless/b43legacy/
+F:	drivers/net/wireless/broadcom/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
 M:	Jingoo Han <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index 0c47f2ca2207..e261df26b0dd 100644
@@ -159,7 +159,6 @@ config MWL8K
 	  will be called mwl8k.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/b43legacy/Kconfig"
 source "drivers/net/wireless/brcm80211/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/ipw2x00/Kconfig"
drivers/net/wireless/Makefile +0 -1
index 7907674ad5b4..13ac61737acd 100644
@@ -15,7 +15,6 @@ obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
-obj-$(CONFIG_B43LEGACY)		+= b43legacy/
 obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
 obj-$(CONFIG_WLAN)		+= realtek/
 
drivers/net/wireless/broadcom/Kconfig +1 -0
index 0ba8119d2cf2..323e738dd96f 100644
@@ -12,5 +12,6 @@ config WLAN_VENDOR_BROADCOM
 if WLAN_VENDOR_BROADCOM
 
 source "drivers/net/wireless/broadcom/b43/Kconfig"
+source "drivers/net/wireless/broadcom/b43legacy/Kconfig"
 
 endif # WLAN_VENDOR_BROADCOM
drivers/net/wireless/broadcom/Makefile +1 -0
index 0140a810107c..66d7cc461fcf 100644
@@ -1 +1,2 @@
 obj-$(CONFIG_B43)		+= b43/
+obj-$(CONFIG_B43LEGACY)		+= b43legacy/
drivers/net/wireless/broadcom/b43legacy/Kconfig renamed from drivers/net/wireless/b43legacy/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/Kconfig
rename to drivers/net/wireless/broadcom/b43legacy/Kconfig
drivers/net/wireless/broadcom/b43legacy/Makefile renamed from drivers/net/wireless/b43legacy/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/Makefile
rename to drivers/net/wireless/broadcom/b43legacy/Makefile
drivers/net/wireless/broadcom/b43legacy/b43legacy.h renamed from drivers/net/wireless/b43legacy/b43legacy.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/b43legacy.h
rename to drivers/net/wireless/broadcom/b43legacy/b43legacy.h
drivers/net/wireless/broadcom/b43legacy/debugfs.c renamed from drivers/net/wireless/b43legacy/debugfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/debugfs.c
rename to drivers/net/wireless/broadcom/b43legacy/debugfs.c
drivers/net/wireless/broadcom/b43legacy/debugfs.h renamed from drivers/net/wireless/b43legacy/debugfs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/debugfs.h
rename to drivers/net/wireless/broadcom/b43legacy/debugfs.h
drivers/net/wireless/broadcom/b43legacy/dma.c renamed from drivers/net/wireless/b43legacy/dma.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/dma.c
rename to drivers/net/wireless/broadcom/b43legacy/dma.c
drivers/net/wireless/broadcom/b43legacy/dma.h renamed from drivers/net/wireless/b43legacy/dma.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/dma.h
rename to drivers/net/wireless/broadcom/b43legacy/dma.h
drivers/net/wireless/broadcom/b43legacy/ilt.c renamed from drivers/net/wireless/b43legacy/ilt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/ilt.c
rename to drivers/net/wireless/broadcom/b43legacy/ilt.c
drivers/net/wireless/broadcom/b43legacy/ilt.h renamed from drivers/net/wireless/b43legacy/ilt.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/ilt.h
rename to drivers/net/wireless/broadcom/b43legacy/ilt.h
drivers/net/wireless/broadcom/b43legacy/leds.c renamed from drivers/net/wireless/b43legacy/leds.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/leds.c
rename to drivers/net/wireless/broadcom/b43legacy/leds.c
drivers/net/wireless/broadcom/b43legacy/leds.h renamed from drivers/net/wireless/b43legacy/leds.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/leds.h
rename to drivers/net/wireless/broadcom/b43legacy/leds.h
drivers/net/wireless/broadcom/b43legacy/main.c renamed from drivers/net/wireless/b43legacy/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/main.c
rename to drivers/net/wireless/broadcom/b43legacy/main.c
drivers/net/wireless/broadcom/b43legacy/main.h renamed from drivers/net/wireless/b43legacy/main.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/main.h
rename to drivers/net/wireless/broadcom/b43legacy/main.h
drivers/net/wireless/broadcom/b43legacy/phy.c renamed from drivers/net/wireless/b43legacy/phy.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/phy.c
rename to drivers/net/wireless/broadcom/b43legacy/phy.c
drivers/net/wireless/broadcom/b43legacy/phy.h renamed from drivers/net/wireless/b43legacy/phy.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/phy.h
rename to drivers/net/wireless/broadcom/b43legacy/phy.h
drivers/net/wireless/broadcom/b43legacy/pio.c renamed from drivers/net/wireless/b43legacy/pio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/pio.c
rename to drivers/net/wireless/broadcom/b43legacy/pio.c
drivers/net/wireless/broadcom/b43legacy/pio.h renamed from drivers/net/wireless/b43legacy/pio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/pio.h
rename to drivers/net/wireless/broadcom/b43legacy/pio.h
drivers/net/wireless/broadcom/b43legacy/radio.c renamed from drivers/net/wireless/b43legacy/radio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/radio.c
rename to drivers/net/wireless/broadcom/b43legacy/radio.c
drivers/net/wireless/broadcom/b43legacy/radio.h renamed from drivers/net/wireless/b43legacy/radio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/radio.h
rename to drivers/net/wireless/broadcom/b43legacy/radio.h
drivers/net/wireless/broadcom/b43legacy/rfkill.c renamed from drivers/net/wireless/b43legacy/rfkill.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/rfkill.c
rename to drivers/net/wireless/broadcom/b43legacy/rfkill.c
drivers/net/wireless/broadcom/b43legacy/rfkill.h renamed from drivers/net/wireless/b43legacy/rfkill.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/rfkill.h
rename to drivers/net/wireless/broadcom/b43legacy/rfkill.h
drivers/net/wireless/broadcom/b43legacy/sysfs.c renamed from drivers/net/wireless/b43legacy/sysfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/sysfs.c
rename to drivers/net/wireless/broadcom/b43legacy/sysfs.c
drivers/net/wireless/broadcom/b43legacy/sysfs.h renamed from drivers/net/wireless/b43legacy/sysfs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/sysfs.h
rename to drivers/net/wireless/broadcom/b43legacy/sysfs.h
drivers/net/wireless/broadcom/b43legacy/xmit.c renamed from drivers/net/wireless/b43legacy/xmit.c +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/xmit.c
rename to drivers/net/wireless/broadcom/b43legacy/xmit.c
drivers/net/wireless/broadcom/b43legacy/xmit.h renamed from drivers/net/wireless/b43legacy/xmit.h +0 -0
similarity index 100%
rename from drivers/net/wireless/b43legacy/xmit.h
rename to drivers/net/wireless/broadcom/b43legacy/xmit.h
Signature · 1 line
1.7.9.5
author
#6 lore raw

PATCH v2 6/27 brcm80211: move under broadcom vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    3 ---
 drivers/net/wireless/broadcom/Kconfig              |    1 +
 drivers/net/wireless/broadcom/Makefile             |    3 +++
 .../net/wireless/{ => broadcom}/brcm80211/Kconfig  |    0
 .../net/wireless/{ => broadcom}/brcm80211/Makefile |    0
 .../{ => broadcom}/brcm80211/brcmfmac/Makefile     |    4 ++--
 .../{ => broadcom}/brcm80211/brcmfmac/bcdc.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/bcdc.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/btcoex.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/btcoex.h     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/bus.h        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/chip.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/chip.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/common.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/common.h     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/commonring.c |    0
 .../{ => broadcom}/brcm80211/brcmfmac/commonring.h |    0
 .../{ => broadcom}/brcm80211/brcmfmac/core.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/core.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/debug.c      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/debug.h      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/feature.c    |    0
 .../{ => broadcom}/brcm80211/brcmfmac/feature.h    |    0
 .../{ => broadcom}/brcm80211/brcmfmac/firmware.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/firmware.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/flowring.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/flowring.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fweh.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fweh.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil_types.h |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.c   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.h   |    0
 .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.h     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/of.c         |    0
 .../{ => broadcom}/brcm80211/brcmfmac/of.h         |    0
 .../{ => broadcom}/brcm80211/brcmfmac/p2p.c        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/p2p.h        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/pcie.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/pcie.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/proto.c      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/proto.h      |    0
 .../{ => broadcom}/brcm80211/brcmfmac/sdio.c       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/sdio.h       |    0
 .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.c |    0
 .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.h |    0
 .../{ => broadcom}/brcm80211/brcmfmac/usb.c        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/usb.h        |    0
 .../{ => broadcom}/brcm80211/brcmfmac/vendor.c     |    0
 .../{ => broadcom}/brcm80211/brcmfmac/vendor.h     |    0
 .../{ => broadcom}/brcm80211/brcmsmac/Makefile     |    6 +++---
 .../{ => broadcom}/brcm80211/brcmsmac/aiutils.c    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/aiutils.h    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/ampdu.c      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/ampdu.h      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/antsel.c     |    0
 .../{ => broadcom}/brcm80211/brcmsmac/antsel.h     |    0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h      |    0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h  |    0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h   |    0
 .../brcm80211/brcmsmac/brcms_trace_events.c        |    0
 .../brcm80211/brcmsmac/brcms_trace_events.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/channel.c    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/channel.h    |    0
 .../{ => broadcom}/brcm80211/brcmsmac/d11.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/debug.c      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/debug.h      |    0
 .../{ => broadcom}/brcm80211/brcmsmac/dma.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/dma.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/led.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/led.h        |    0
 .../brcm80211/brcmsmac/mac80211_if.c               |    0
 .../brcm80211/brcmsmac/mac80211_if.h               |    0
 .../{ => broadcom}/brcm80211/brcmsmac/main.c       |    0
 .../{ => broadcom}/brcm80211/brcmsmac/main.h       |    0
 .../brcm80211/brcmsmac/phy/phy_cmn.c               |    0
 .../brcm80211/brcmsmac/phy/phy_hal.h               |    0
 .../brcm80211/brcmsmac/phy/phy_int.h               |    0
 .../brcm80211/brcmsmac/phy/phy_lcn.c               |    0
 .../brcm80211/brcmsmac/phy/phy_lcn.h               |    0
 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c  |    0
 .../brcm80211/brcmsmac/phy/phy_qmath.c             |    0
 .../brcm80211/brcmsmac/phy/phy_qmath.h             |    0
 .../brcm80211/brcmsmac/phy/phy_radio.h             |    0
 .../brcm80211/brcmsmac/phy/phyreg_n.h              |    0
 .../brcm80211/brcmsmac/phy/phytbl_lcn.c            |    0
 .../brcm80211/brcmsmac/phy/phytbl_lcn.h            |    0
 .../brcm80211/brcmsmac/phy/phytbl_n.c              |    0
 .../brcm80211/brcmsmac/phy/phytbl_n.h              |    0
 .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.c   |    0
 .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.h   |    0
 .../{ => broadcom}/brcm80211/brcmsmac/pmu.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/pmu.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/pub.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/rate.c       |    0
 .../{ => broadcom}/brcm80211/brcmsmac/rate.h       |    0
 .../{ => broadcom}/brcm80211/brcmsmac/scb.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/stf.c        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/stf.h        |    0
 .../{ => broadcom}/brcm80211/brcmsmac/types.h      |    0
 .../brcm80211/brcmsmac/ucode_loader.c              |    0
 .../brcm80211/brcmsmac/ucode_loader.h              |    0
 .../{ => broadcom}/brcm80211/brcmutil/Makefile     |    4 ++--
 .../{ => broadcom}/brcm80211/brcmutil/d11.c        |    0
 .../{ => broadcom}/brcm80211/brcmutil/utils.c      |    0
 .../{ => broadcom}/brcm80211/include/brcm_hw_ids.h |    0
 .../{ => broadcom}/brcm80211/include/brcmu_d11.h   |    0
 .../{ => broadcom}/brcm80211/include/brcmu_utils.h |    0
 .../{ => broadcom}/brcm80211/include/brcmu_wifi.h  |    0
 .../{ => broadcom}/brcm80211/include/chipcommon.h  |    0
 .../{ => broadcom}/brcm80211/include/defs.h        |    0
 .../{ => broadcom}/brcm80211/include/soc.h         |    0
 119 files changed, 12 insertions(+), 12 deletions(-)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/Makefile (93%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bus.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil_types.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/Makefile (88%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/d11.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_cmn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_hal.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_int.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_radio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phyreg_n.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pub.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/scb.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/types.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/Makefile (89%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/d11.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/utils.c (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcm_hw_ids.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_d11.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_utils.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_wifi.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/chipcommon.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/defs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/brcm80211/include/soc.h (100%)
MAINTAINERS +1 -1
index dd20c0b1eb02..748ee82f2ebe 100644
@@ -2390,7 +2390,7 @@ M:	Hante Meuleman <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Supported
-F:	drivers/net/wireless/brcm80211/
+F:	drivers/net/wireless/broadcom/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 M:	[email protected]
drivers/net/wireless/Kconfig +0 -1
index e261df26b0dd..c627d9e41ede 100644
@@ -159,7 +159,6 @@ config MWL8K
 	  will be called mwl8k.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/brcm80211/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/ipw2x00/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
drivers/net/wireless/Makefile +0 -3
index 13ac61737acd..41ebe5641c01 100644
@@ -47,8 +47,5 @@ obj-$(CONFIG_WL_TI)	+= ti/
 
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
 
-obj-$(CONFIG_BRCMFMAC)	+= brcm80211/
-obj-$(CONFIG_BRCMSMAC)	+= brcm80211/
-
 obj-$(CONFIG_CW1200)	+= cw1200/
 obj-$(CONFIG_RSI_91X)	+= rsi/
drivers/net/wireless/broadcom/Kconfig +1 -0
index 323e738dd96f..d3651ceb5046 100644
@@ -13,5 +13,6 @@ if WLAN_VENDOR_BROADCOM
 
 source "drivers/net/wireless/broadcom/b43/Kconfig"
 source "drivers/net/wireless/broadcom/b43legacy/Kconfig"
+source "drivers/net/wireless/broadcom/brcm80211/Kconfig"
 
 endif # WLAN_VENDOR_BROADCOM
drivers/net/wireless/broadcom/Makefile +3 -0
index 66d7cc461fcf..9d5ac95710c3 100644
@@ -1,2 +1,5 @@
 obj-$(CONFIG_B43)		+= b43/
 obj-$(CONFIG_B43LEGACY)		+= b43legacy/
+
+obj-$(CONFIG_BRCMFMAC)	+= brcm80211/
+obj-$(CONFIG_BRCMSMAC)	+= brcm80211/
drivers/net/wireless/broadcom/brcm80211/Kconfig renamed from drivers/net/wireless/brcm80211/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/Kconfig
rename to drivers/net/wireless/broadcom/brcm80211/Kconfig
drivers/net/wireless/broadcom/brcm80211/Makefile renamed from drivers/net/wireless/brcm80211/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/Makefile
rename to drivers/net/wireless/broadcom/brcm80211/Makefile
drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile renamed from drivers/net/wireless/brcm80211/brcmfmac/Makefile +2 -2
similarity index 93%
rename from drivers/net/wireless/brcm80211/brcmfmac/Makefile
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
index dc4c75083085..9e4b505ca593 100644
@@ -16,8 +16,8 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y += \
-	-Idrivers/net/wireless/brcm80211/brcmfmac	\
-	-Idrivers/net/wireless/brcm80211/include
+	-Idrivers/net/wireless/broadcom/brcm80211/brcmfmac	\
+	-Idrivers/net/wireless/broadcom/brcm80211/include
 
 ccflags-y += -D__CHECK_ENDIAN__
 
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c renamed from drivers/net/wireless/brcm80211/brcmfmac/bcdc.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h renamed from drivers/net/wireless/brcm80211/brcmfmac/bcdc.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/bcdc.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c renamed from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c renamed from drivers/net/wireless/brcm80211/brcmfmac/btcoex.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/btcoex.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h renamed from drivers/net/wireless/brcm80211/brcmfmac/btcoex.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/btcoex.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h renamed from drivers/net/wireless/brcm80211/brcmfmac/bus.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/bus.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c renamed from drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h renamed from drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c renamed from drivers/net/wireless/brcm80211/brcmfmac/chip.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/chip.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h renamed from drivers/net/wireless/brcm80211/brcmfmac/chip.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/chip.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c renamed from drivers/net/wireless/brcm80211/brcmfmac/common.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/common.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h renamed from drivers/net/wireless/brcm80211/brcmfmac/common.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/common.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c renamed from drivers/net/wireless/brcm80211/brcmfmac/commonring.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/commonring.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h renamed from drivers/net/wireless/brcm80211/brcmfmac/commonring.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/commonring.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c renamed from drivers/net/wireless/brcm80211/brcmfmac/core.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/core.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h renamed from drivers/net/wireless/brcm80211/brcmfmac/core.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/core.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c renamed from drivers/net/wireless/brcm80211/brcmfmac/debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/debug.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h renamed from drivers/net/wireless/brcm80211/brcmfmac/debug.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/debug.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c renamed from drivers/net/wireless/brcm80211/brcmfmac/feature.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/feature.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h renamed from drivers/net/wireless/brcm80211/brcmfmac/feature.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/feature.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c renamed from drivers/net/wireless/brcm80211/brcmfmac/firmware.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/firmware.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h renamed from drivers/net/wireless/brcm80211/brcmfmac/firmware.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/firmware.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c renamed from drivers/net/wireless/brcm80211/brcmfmac/flowring.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/flowring.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h renamed from drivers/net/wireless/brcm80211/brcmfmac/flowring.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/flowring.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c renamed from drivers/net/wireless/brcm80211/brcmfmac/fweh.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fweh.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h renamed from drivers/net/wireless/brcm80211/brcmfmac/fweh.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fweh.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c renamed from drivers/net/wireless/brcm80211/brcmfmac/fwil.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fwil.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h renamed from drivers/net/wireless/brcm80211/brcmfmac/fwil.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fwil.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h renamed from drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c renamed from drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h renamed from drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c renamed from drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h renamed from drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c renamed from drivers/net/wireless/brcm80211/brcmfmac/of.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/of.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h renamed from drivers/net/wireless/brcm80211/brcmfmac/of.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/of.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c renamed from drivers/net/wireless/brcm80211/brcmfmac/p2p.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/p2p.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h renamed from drivers/net/wireless/brcm80211/brcmfmac/p2p.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/p2p.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c renamed from drivers/net/wireless/brcm80211/brcmfmac/pcie.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/pcie.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h renamed from drivers/net/wireless/brcm80211/brcmfmac/pcie.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/pcie.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c renamed from drivers/net/wireless/brcm80211/brcmfmac/proto.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/proto.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h renamed from drivers/net/wireless/brcm80211/brcmfmac/proto.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/proto.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c renamed from drivers/net/wireless/brcm80211/brcmfmac/sdio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/sdio.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h renamed from drivers/net/wireless/brcm80211/brcmfmac/sdio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/sdio.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c renamed from drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h renamed from drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c renamed from drivers/net/wireless/brcm80211/brcmfmac/usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/usb.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h renamed from drivers/net/wireless/brcm80211/brcmfmac/usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/usb.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h
drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c renamed from drivers/net/wireless/brcm80211/brcmfmac/vendor.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/vendor.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c
drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h renamed from drivers/net/wireless/brcm80211/brcmfmac/vendor.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmfmac/vendor.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile renamed from drivers/net/wireless/brcm80211/brcmsmac/Makefile +3 -3
similarity index 88%
rename from drivers/net/wireless/brcm80211/brcmsmac/Makefile
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
index 32464acccd90..960e6b86bbcb 100644
@@ -17,9 +17,9 @@
 
 ccflags-y := \
 	-D__CHECK_ENDIAN__ \
-	-Idrivers/net/wireless/brcm80211/brcmsmac \
-	-Idrivers/net/wireless/brcm80211/brcmsmac/phy \
-	-Idrivers/net/wireless/brcm80211/include
+	-Idrivers/net/wireless/broadcom/brcm80211/brcmsmac \
+	-Idrivers/net/wireless/broadcom/brcm80211/brcmsmac/phy \
+	-Idrivers/net/wireless/broadcom/brcm80211/include
 
 brcmsmac-y := \
 	mac80211_if.o \
drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c renamed from drivers/net/wireless/brcm80211/brcmsmac/aiutils.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h renamed from drivers/net/wireless/brcm80211/brcmsmac/aiutils.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/aiutils.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c renamed from drivers/net/wireless/brcm80211/brcmsmac/ampdu.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.h renamed from drivers/net/wireless/brcm80211/brcmsmac/ampdu.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/ampdu.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c renamed from drivers/net/wireless/brcm80211/brcmsmac/antsel.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/antsel.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.h renamed from drivers/net/wireless/brcm80211/brcmsmac/antsel.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/antsel.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h renamed from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h renamed from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h renamed from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.c renamed from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.h renamed from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c renamed from drivers/net/wireless/brcm80211/brcmsmac/channel.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/channel.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.h renamed from drivers/net/wireless/brcm80211/brcmsmac/channel.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/channel.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h renamed from drivers/net/wireless/brcm80211/brcmsmac/d11.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/d11.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c renamed from drivers/net/wireless/brcm80211/brcmsmac/debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/debug.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h renamed from drivers/net/wireless/brcm80211/brcmsmac/debug.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/debug.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c renamed from drivers/net/wireless/brcm80211/brcmsmac/dma.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/dma.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h renamed from drivers/net/wireless/brcm80211/brcmsmac/dma.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/dma.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c renamed from drivers/net/wireless/brcm80211/brcmsmac/led.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/led.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h renamed from drivers/net/wireless/brcm80211/brcmsmac/led.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/led.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c renamed from drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h renamed from drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c renamed from drivers/net/wireless/brcm80211/brcmsmac/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/main.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h renamed from drivers/net/wireless/brcm80211/brcmsmac/main.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/main.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_radio.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_radio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phy_radio.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c renamed from drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h renamed from drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c renamed from drivers/net/wireless/brcm80211/brcmsmac/pmu.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/pmu.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.h renamed from drivers/net/wireless/brcm80211/brcmsmac/pmu.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/pmu.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h renamed from drivers/net/wireless/brcm80211/brcmsmac/pub.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/pub.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c renamed from drivers/net/wireless/brcm80211/brcmsmac/rate.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/rate.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h renamed from drivers/net/wireless/brcm80211/brcmsmac/rate.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/rate.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h renamed from drivers/net/wireless/brcm80211/brcmsmac/scb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/scb.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c renamed from drivers/net/wireless/brcm80211/brcmsmac/stf.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/stf.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h renamed from drivers/net/wireless/brcm80211/brcmsmac/stf.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/stf.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h renamed from drivers/net/wireless/brcm80211/brcmsmac/types.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/types.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h
drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.c renamed from drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.c
drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.h renamed from drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h
rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.h
drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile renamed from drivers/net/wireless/brcm80211/brcmutil/Makefile +2 -2
similarity index 89%
rename from drivers/net/wireless/brcm80211/brcmutil/Makefile
rename to drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
index 8a928184016a..256c91f9ac4b 100644
@@ -16,8 +16,8 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y :=				\
-	-Idrivers/net/wireless/brcm80211/brcmutil \
-	-Idrivers/net/wireless/brcm80211/include
+	-Idrivers/net/wireless/broadcom/brcm80211/brcmutil \
+	-Idrivers/net/wireless/broadcom/brcm80211/include
 
 obj-$(CONFIG_BRCMUTIL)	+= brcmutil.o
 brcmutil-objs	= utils.o d11.o
drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c renamed from drivers/net/wireless/brcm80211/brcmutil/d11.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmutil/d11.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c renamed from drivers/net/wireless/brcm80211/brcmutil/utils.c +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/brcmutil/utils.c
rename to drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c
drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h renamed from drivers/net/wireless/brcm80211/include/brcm_hw_ids.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
rename to drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h renamed from drivers/net/wireless/brcm80211/include/brcmu_d11.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/brcmu_d11.h
rename to drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h renamed from drivers/net/wireless/brcm80211/include/brcmu_utils.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/brcmu_utils.h
rename to drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h
drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h renamed from drivers/net/wireless/brcm80211/include/brcmu_wifi.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/brcmu_wifi.h
rename to drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h renamed from drivers/net/wireless/brcm80211/include/chipcommon.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/chipcommon.h
rename to drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h
drivers/net/wireless/broadcom/brcm80211/include/defs.h renamed from drivers/net/wireless/brcm80211/include/defs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/defs.h
rename to drivers/net/wireless/broadcom/brcm80211/include/defs.h
drivers/net/wireless/broadcom/brcm80211/include/soc.h renamed from drivers/net/wireless/brcm80211/include/soc.h +0 -0
similarity index 100%
rename from drivers/net/wireless/brcm80211/include/soc.h
rename to drivers/net/wireless/broadcom/brcm80211/include/soc.h
Signature · 1 line
1.7.9.5
#7 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

Hauke

#8 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 7 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

Quoted 7 lines

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

Would not that make keeping track of the previous and future history harder for people contributing to these drivers? I could imagine that for Arend and other Broadcom engineers, dealing with a simple level move would be manageable, but having to account for a different directory hierarchy could be a pain.

What is the impact on compat-wireless after/before these changes by the way?

Signature · 1 line
Florian
author
#9 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 16 lines · Florian Fainelli
Quoted 7 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

Quoted 7 lines

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

Quoted 7 lines

Would not that make keeping track of the previous and future history harder for people contributing to these drivers? I could imagine that for Arend and other Broadcom engineers, dealing with a simple level move would be manageable, but having to account for a different directory hierarchy could be a pain.

What is the impact on compat-wireless after/before these changes by the way?

It's called backports nowadays :)

But I understood that as long as we have a separate kconfig option for the vendor directories (CONFIG_WLAN_VENDOR_*) it should be ok. For 4.3 we didn't have that for realtek directory and that caused pain for backports.

Signature · 5 lines
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#10 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 24 lines · Kalle Valo
Quoted 22 lines · Florian Fainelli
Quoted 7 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

Quoted 7 lines

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

Would not that make keeping track of the previous and future history harder for people contributing to these drivers? I could imagine that for Arend and other Broadcom engineers, dealing with a simple level move would be manageable, but having to account for a different directory hierarchy could be a pain.

Quoted 8 lines
Quoted 1 line

What is the impact on compat-wireless after/before these changes by the way?

It's called backports nowadays :)

But I understood that as long as we have a separate kconfig option for the vendor directories (CONFIG_WLAN_VENDOR_*) it should be ok. For 4.3 we didn't have that for realtek directory and that caused pain for backports.

That is my understanding as well.

Regards,
Arend

author
#11 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

In reply to Hauke Mehrtens
Quoted 7 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

Quoted 7 lines

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated.

And I actually like the brcm80211 directory, I would not mind keeping it still.

Signature · 1 line
Kalle Valo
#12 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 15 lines · Kalle Valo
Quoted 13 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

Quoted 7 lines
Quoted 1 line

This way we have one directory less.

I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated.

And I actually like the brcm80211 directory, I would not mind keeping it still.

I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211.

So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p

Regards,
Arend

#13 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 23 lines · Arend van Spriel
Quoted 22 lines · Kalle Valo
Quoted 8 lines · Hauke Mehrtens
Quoted 6 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to
edit Makefiles from subdirectories to use the new location.

---

Quoted 8 lines

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated.

Quoted 8 lines
Quoted 2 lines

And I actually like the brcm80211 directory, I would not mind keeping it still.

I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211.

So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p

Ok, then leave it like Kalle proposed. backports should work with both versions.

Hauke

author
#14 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

In reply to Arend van Spriel
Quoted 21 lines · Arend van Spriel
Quoted 20 lines · Kalle Valo
Quoted 7 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

Quoted 7 lines

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

This way we have one directory less.

I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated.

Quoted 8 lines
Quoted 2 lines

And I actually like the brcm80211 directory, I would not mind keeping it still.

I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211.

So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p

Sorry, the vendor patches go in first :) It's much safer that way.

But I think that git should be smart enough and your patchset from before the merge window should still apply without issues.

Signature · 1 line
Kalle Valo
#15 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 29 lines · Kalle Valo
Quoted 27 lines · Arend van Spriel
Quoted 15 lines · Kalle Valo
Quoted 13 lines · Hauke Mehrtens
Quoted 5 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location.

---

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

Quoted 7 lines
Quoted 1 line

This way we have one directory less.

I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated.

And I actually like the brcm80211 directory, I would not mind keeping it still.

I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211.

Quoted 7 lines
Quoted 2 lines

So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p

Sorry, the vendor patches go in first :) It's much safer that way.

But I think that git should be smart enough and your patchset from before the merge window should still apply without issues.

Will see if that is true when I merge it in our internal repo. :-p

Thanks,
Arend

#16 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 36 lines · Arend van Spriel
Quoted 35 lines · Kalle Valo
Quoted 32 lines · Arend van Spriel
Quoted 17 lines · Kalle Valo
Quoted 15 lines · Hauke Mehrtens
Quoted 6 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig. Note that I had to
edit Makefiles from subdirectories to use the new location.

---

I would prefer to remove the brcm80211 directory in this process and create:
drivers/net/wireless/broadcom/brcmfmac drivers/net/wireless/broadcom/brcmsmac drivers/net/wireless/broadcom/brcmutil drivers/net/wireless/broadcom/include

Quoted 8 lines
Quoted 1 line

This way we have one directory less.

I think this could be done separately. This patchset is big enough already, I would not like to make it anymore complicated.

And I actually like the brcm80211 directory, I would not mind keeping it
still.

I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211.

So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p

Quoted 6 lines
Quoted 4 lines

Sorry, the vendor patches go in first :) It's much safer that way.

But I think that git should be smart enough and your patchset from before the merge window should still apply without issues.

Will see if that is true when I merge it in our internal repo. :-p

Just applied the pending patches using 'git am -3' and that works fine. So when told to be smart, git is indeed smart ;-)

Regards,
Arend

author
#17 lore raw

Re: [PATCH v2 06/27] brcm80211: move under broadcom vendor directory

Quoted 8 lines · Arend van Spriel
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines

I prefer to keep it as brcmsmac and brcmfmac rely on brcmutil module so I want to keep them together under brcm80211.

So does this patch go in before or after the patches I submitted before the merge window. I hope after :-p

Sorry, the vendor patches go in first :) It's much safer that way.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

But I think that git should be smart enough and your patchset from before the merge window should still apply without issues.

Will see if that is true when I merge it in our internal repo. :-p

Just applied the pending patches using 'git am -3' and that works fine. So when told to be smart, git is indeed smart ;-)

Git is awesome :) Thanks for checking.

Signature · 1 line
Kalle Valo
author
#18 lore raw

PATCH v2 7/27 cw1200: move under st vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    2 +-
 drivers/net/wireless/Makefile                      |    2 +-
 drivers/net/wireless/st/Kconfig                    |   16 ++++++++++++++++
 drivers/net/wireless/st/Makefile                   |    1 +
 drivers/net/wireless/{ => st}/cw1200/Kconfig       |    0
 drivers/net/wireless/{ => st}/cw1200/Makefile      |    0
 drivers/net/wireless/{ => st}/cw1200/bh.c          |    0
 drivers/net/wireless/{ => st}/cw1200/bh.h          |    0
 drivers/net/wireless/{ => st}/cw1200/cw1200.h      |    0
 drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c |    0
 drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c  |    0
 drivers/net/wireless/{ => st}/cw1200/debug.c       |    0
 drivers/net/wireless/{ => st}/cw1200/debug.h       |    0
 drivers/net/wireless/{ => st}/cw1200/fwio.c        |    0
 drivers/net/wireless/{ => st}/cw1200/fwio.h        |    0
 drivers/net/wireless/{ => st}/cw1200/hwbus.h       |    0
 drivers/net/wireless/{ => st}/cw1200/hwio.c        |    0
 drivers/net/wireless/{ => st}/cw1200/hwio.h        |    0
 drivers/net/wireless/{ => st}/cw1200/main.c        |    0
 drivers/net/wireless/{ => st}/cw1200/pm.c          |    0
 drivers/net/wireless/{ => st}/cw1200/pm.h          |    0
 drivers/net/wireless/{ => st}/cw1200/queue.c       |    0
 drivers/net/wireless/{ => st}/cw1200/queue.h       |    0
 drivers/net/wireless/{ => st}/cw1200/scan.c        |    0
 drivers/net/wireless/{ => st}/cw1200/scan.h        |    0
 drivers/net/wireless/{ => st}/cw1200/sta.c         |    0
 drivers/net/wireless/{ => st}/cw1200/sta.h         |    0
 drivers/net/wireless/{ => st}/cw1200/txrx.c        |    0
 drivers/net/wireless/{ => st}/cw1200/txrx.h        |    0
 drivers/net/wireless/{ => st}/cw1200/wsm.c         |    0
 drivers/net/wireless/{ => st}/cw1200/wsm.h         |    0
 32 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/st/Kconfig
 create mode 100644 drivers/net/wireless/st/Makefile
 rename drivers/net/wireless/{ => st}/cw1200/Kconfig (100%)
 rename drivers/net/wireless/{ => st}/cw1200/Makefile (100%)
 rename drivers/net/wireless/{ => st}/cw1200/bh.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/bh.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/debug.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/debug.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/fwio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/fwio.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwbus.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwio.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/main.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/pm.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/pm.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/queue.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/queue.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/scan.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/scan.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/sta.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/sta.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/txrx.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/txrx.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/wsm.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/wsm.h (100%)
MAINTAINERS +1 -1
index 748ee82f2ebe..4cbd4641e6fb 100644
@@ -3100,7 +3100,7 @@ F:	sound/pci/cs5535audio/
 CW1200 WLAN driver
 M:	Solomon Peachy <[email protected]>
 S:	Maintained
-F:	drivers/net/wireless/cw1200/
+F:	drivers/net/wireless/st/cw1200/
 
 CX18 VIDEO4LINUX DRIVER
 M:	Andy Walls <[email protected]>
drivers/net/wireless/Kconfig +1 -1
index c627d9e41ede..c1742f228fec 100644
@@ -21,6 +21,7 @@ source "drivers/net/wireless/admtek/Kconfig"
 source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
+source "drivers/net/wireless/st/Kconfig"
 
 config PCMCIA_RAYCS
 	tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -173,7 +174,6 @@ source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/mwifiex/Kconfig"
-source "drivers/net/wireless/cw1200/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN
drivers/net/wireless/Makefile +1 -1
index 41ebe5641c01..d7211a7949e6 100644
@@ -6,6 +6,7 @@ obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
 obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 
 obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
@@ -47,5 +48,4 @@ obj-$(CONFIG_WL_TI)	+= ti/
 
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
 
-obj-$(CONFIG_CW1200)	+= cw1200/
 obj-$(CONFIG_RSI_91X)	+= rsi/
drivers/net/wireless/st/Kconfig new file +16 -0
new file mode 100644
index 000000000000..969b4f6e53b5
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_ST
+	bool "STMicroelectronics devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_ST
+
+source "drivers/net/wireless/st/cw1200/Kconfig"
+
+endif # WLAN_VENDOR_ST
drivers/net/wireless/st/Makefile new file +1 -0
new file mode 100644
index 000000000000..a60d6350ba46
@@ -0,0 +1 @@
+obj-$(CONFIG_CW1200)	+= cw1200/
drivers/net/wireless/st/cw1200/Kconfig renamed from drivers/net/wireless/cw1200/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/Kconfig
rename to drivers/net/wireless/st/cw1200/Kconfig
drivers/net/wireless/st/cw1200/Makefile renamed from drivers/net/wireless/cw1200/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/Makefile
rename to drivers/net/wireless/st/cw1200/Makefile
drivers/net/wireless/st/cw1200/bh.c renamed from drivers/net/wireless/cw1200/bh.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/bh.c
rename to drivers/net/wireless/st/cw1200/bh.c
drivers/net/wireless/st/cw1200/bh.h renamed from drivers/net/wireless/cw1200/bh.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/bh.h
rename to drivers/net/wireless/st/cw1200/bh.h
drivers/net/wireless/st/cw1200/cw1200.h renamed from drivers/net/wireless/cw1200/cw1200.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/cw1200.h
rename to drivers/net/wireless/st/cw1200/cw1200.h
drivers/net/wireless/st/cw1200/cw1200_sdio.c renamed from drivers/net/wireless/cw1200/cw1200_sdio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/cw1200_sdio.c
rename to drivers/net/wireless/st/cw1200/cw1200_sdio.c
drivers/net/wireless/st/cw1200/cw1200_spi.c renamed from drivers/net/wireless/cw1200/cw1200_spi.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/cw1200_spi.c
rename to drivers/net/wireless/st/cw1200/cw1200_spi.c
drivers/net/wireless/st/cw1200/debug.c renamed from drivers/net/wireless/cw1200/debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/debug.c
rename to drivers/net/wireless/st/cw1200/debug.c
drivers/net/wireless/st/cw1200/debug.h renamed from drivers/net/wireless/cw1200/debug.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/debug.h
rename to drivers/net/wireless/st/cw1200/debug.h
drivers/net/wireless/st/cw1200/fwio.c renamed from drivers/net/wireless/cw1200/fwio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/fwio.c
rename to drivers/net/wireless/st/cw1200/fwio.c
drivers/net/wireless/st/cw1200/fwio.h renamed from drivers/net/wireless/cw1200/fwio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/fwio.h
rename to drivers/net/wireless/st/cw1200/fwio.h
drivers/net/wireless/st/cw1200/hwbus.h renamed from drivers/net/wireless/cw1200/hwbus.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/hwbus.h
rename to drivers/net/wireless/st/cw1200/hwbus.h
drivers/net/wireless/st/cw1200/hwio.c renamed from drivers/net/wireless/cw1200/hwio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/hwio.c
rename to drivers/net/wireless/st/cw1200/hwio.c
drivers/net/wireless/st/cw1200/hwio.h renamed from drivers/net/wireless/cw1200/hwio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/hwio.h
rename to drivers/net/wireless/st/cw1200/hwio.h
drivers/net/wireless/st/cw1200/main.c renamed from drivers/net/wireless/cw1200/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/main.c
rename to drivers/net/wireless/st/cw1200/main.c
drivers/net/wireless/st/cw1200/pm.c renamed from drivers/net/wireless/cw1200/pm.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/pm.c
rename to drivers/net/wireless/st/cw1200/pm.c
drivers/net/wireless/st/cw1200/pm.h renamed from drivers/net/wireless/cw1200/pm.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/pm.h
rename to drivers/net/wireless/st/cw1200/pm.h
drivers/net/wireless/st/cw1200/queue.c renamed from drivers/net/wireless/cw1200/queue.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/queue.c
rename to drivers/net/wireless/st/cw1200/queue.c
drivers/net/wireless/st/cw1200/queue.h renamed from drivers/net/wireless/cw1200/queue.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/queue.h
rename to drivers/net/wireless/st/cw1200/queue.h
drivers/net/wireless/st/cw1200/scan.c renamed from drivers/net/wireless/cw1200/scan.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/scan.c
rename to drivers/net/wireless/st/cw1200/scan.c
drivers/net/wireless/st/cw1200/scan.h renamed from drivers/net/wireless/cw1200/scan.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/scan.h
rename to drivers/net/wireless/st/cw1200/scan.h
drivers/net/wireless/st/cw1200/sta.c renamed from drivers/net/wireless/cw1200/sta.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/sta.c
rename to drivers/net/wireless/st/cw1200/sta.c
drivers/net/wireless/st/cw1200/sta.h renamed from drivers/net/wireless/cw1200/sta.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/sta.h
rename to drivers/net/wireless/st/cw1200/sta.h
drivers/net/wireless/st/cw1200/txrx.c renamed from drivers/net/wireless/cw1200/txrx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/txrx.c
rename to drivers/net/wireless/st/cw1200/txrx.c
drivers/net/wireless/st/cw1200/txrx.h renamed from drivers/net/wireless/cw1200/txrx.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/txrx.h
rename to drivers/net/wireless/st/cw1200/txrx.h
drivers/net/wireless/st/cw1200/wsm.c renamed from drivers/net/wireless/cw1200/wsm.c +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/wsm.c
rename to drivers/net/wireless/st/cw1200/wsm.c
drivers/net/wireless/st/cw1200/wsm.h renamed from drivers/net/wireless/cw1200/wsm.h +0 -0
similarity index 100%
rename from drivers/net/wireless/cw1200/wsm.h
rename to drivers/net/wireless/st/cw1200/wsm.h
Signature · 1 line
1.7.9.5
author
#19 lore raw

PATCH v2 8/27 ipw2x00: move under intel vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    2 +-
 drivers/net/wireless/Makefile                      |    4 +---
 drivers/net/wireless/intel/Kconfig                 |   16 ++++++++++++++++
 drivers/net/wireless/intel/Makefile                |    2 ++
 drivers/net/wireless/{ => intel}/ipw2x00/Kconfig   |    0
 drivers/net/wireless/{ => intel}/ipw2x00/Makefile  |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw.h     |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c |    0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h |    0
 drivers/net/wireless/{ => intel}/ipw2x00/libipw.h  |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_geo.c  |    0
 .../wireless/{ => intel}/ipw2x00/libipw_module.c   |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_rx.c   |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_tx.c   |    0
 .../net/wireless/{ => intel}/ipw2x00/libipw_wx.c   |    0
 18 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 drivers/net/wireless/intel/Kconfig
 create mode 100644 drivers/net/wireless/intel/Makefile
 rename drivers/net/wireless/{ => intel}/ipw2x00/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_geo.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_module.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_rx.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_tx.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_wx.c (100%)
MAINTAINERS +1 -1
index 4cbd4641e6fb..b341dabeb579 100644
@@ -5607,7 +5607,7 @@ L:	[email protected]
 S:	Maintained
 F:	Documentation/networking/README.ipw2100
 F:	Documentation/networking/README.ipw2200
-F:	drivers/net/wireless/ipw2x00/
+F:	drivers/net/wireless/intel/ipw2x00/
 
 INTEL(R) TRACE HUB
 M:	Alexander Shishkin <[email protected]>
drivers/net/wireless/Kconfig +1 -1
index c1742f228fec..73e3b53caf45 100644
@@ -21,6 +21,7 @@ source "drivers/net/wireless/admtek/Kconfig"
 source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
+source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 
 config PCMCIA_RAYCS
@@ -161,7 +162,6 @@ config MWL8K
 
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/ipw2x00/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/iwlegacy/Kconfig"
 source "drivers/net/wireless/libertas/Kconfig"
drivers/net/wireless/Makefile +1 -3
index d7211a7949e6..52946d8dd31d 100644
@@ -6,11 +6,9 @@ obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
 obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
+obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 
-obj-$(CONFIG_IPW2100) += ipw2x00/
-obj-$(CONFIG_IPW2200) += ipw2x00/
-
 obj-$(CONFIG_HERMES)		+= orinoco/
 
 obj-$(CONFIG_PRISM54)		+= prism54/
drivers/net/wireless/intel/Kconfig new file +16 -0
new file mode 100644
index 000000000000..3f8eacc4209a
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_INTEL
+	bool "Intel devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_INTEL
+
+source "drivers/net/wireless/intel/ipw2x00/Kconfig"
+
+endif # WLAN_VENDOR_INTEL
drivers/net/wireless/intel/Makefile new file +2 -0
new file mode 100644
index 000000000000..8e5dcb2d425e
@@ -0,0 +1,2 @@
+obj-$(CONFIG_IPW2100) += ipw2x00/
+obj-$(CONFIG_IPW2200) += ipw2x00/
drivers/net/wireless/intel/ipw2x00/Kconfig renamed from drivers/net/wireless/ipw2x00/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/Kconfig
rename to drivers/net/wireless/intel/ipw2x00/Kconfig
drivers/net/wireless/intel/ipw2x00/Makefile renamed from drivers/net/wireless/ipw2x00/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/Makefile
rename to drivers/net/wireless/intel/ipw2x00/Makefile
drivers/net/wireless/intel/ipw2x00/ipw.h renamed from drivers/net/wireless/ipw2x00/ipw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/ipw.h
rename to drivers/net/wireless/intel/ipw2x00/ipw.h
drivers/net/wireless/intel/ipw2x00/ipw2100.c renamed from drivers/net/wireless/ipw2x00/ipw2100.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/ipw2100.c
rename to drivers/net/wireless/intel/ipw2x00/ipw2100.c
drivers/net/wireless/intel/ipw2x00/ipw2100.h renamed from drivers/net/wireless/ipw2x00/ipw2100.h +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/ipw2100.h
rename to drivers/net/wireless/intel/ipw2x00/ipw2100.h
drivers/net/wireless/intel/ipw2x00/ipw2200.c renamed from drivers/net/wireless/ipw2x00/ipw2200.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/ipw2200.c
rename to drivers/net/wireless/intel/ipw2x00/ipw2200.c
drivers/net/wireless/intel/ipw2x00/ipw2200.h renamed from drivers/net/wireless/ipw2x00/ipw2200.h +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/ipw2200.h
rename to drivers/net/wireless/intel/ipw2x00/ipw2200.h
drivers/net/wireless/intel/ipw2x00/libipw.h renamed from drivers/net/wireless/ipw2x00/libipw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/libipw.h
rename to drivers/net/wireless/intel/ipw2x00/libipw.h
drivers/net/wireless/intel/ipw2x00/libipw_geo.c renamed from drivers/net/wireless/ipw2x00/libipw_geo.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/libipw_geo.c
rename to drivers/net/wireless/intel/ipw2x00/libipw_geo.c
drivers/net/wireless/intel/ipw2x00/libipw_module.c renamed from drivers/net/wireless/ipw2x00/libipw_module.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/libipw_module.c
rename to drivers/net/wireless/intel/ipw2x00/libipw_module.c
drivers/net/wireless/intel/ipw2x00/libipw_rx.c renamed from drivers/net/wireless/ipw2x00/libipw_rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/libipw_rx.c
rename to drivers/net/wireless/intel/ipw2x00/libipw_rx.c
drivers/net/wireless/intel/ipw2x00/libipw_tx.c renamed from drivers/net/wireless/ipw2x00/libipw_tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/libipw_tx.c
rename to drivers/net/wireless/intel/ipw2x00/libipw_tx.c
drivers/net/wireless/intel/ipw2x00/libipw_wx.c renamed from drivers/net/wireless/ipw2x00/libipw_wx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/ipw2x00/libipw_wx.c
rename to drivers/net/wireless/intel/ipw2x00/libipw_wx.c
Signature · 1 line
1.7.9.5
author
#20 lore raw

PATCH v2 9/27 iwlegacy: move under intel directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    1 -
 drivers/net/wireless/intel/Kconfig                 |    1 +
 drivers/net/wireless/intel/Makefile                |    2 ++
 .../net/wireless/{ => intel}/iwlegacy/3945-debug.c |    0
 .../net/wireless/{ => intel}/iwlegacy/3945-mac.c   |    0
 .../net/wireless/{ => intel}/iwlegacy/3945-rs.c    |    0
 drivers/net/wireless/{ => intel}/iwlegacy/3945.c   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/3945.h   |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-calib.c |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-debug.c |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-mac.c   |    0
 .../net/wireless/{ => intel}/iwlegacy/4965-rs.c    |    0
 drivers/net/wireless/{ => intel}/iwlegacy/4965.c   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/4965.h   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/Kconfig  |    0
 drivers/net/wireless/{ => intel}/iwlegacy/Makefile |    0
 .../net/wireless/{ => intel}/iwlegacy/commands.h   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/common.c |    0
 drivers/net/wireless/{ => intel}/iwlegacy/common.h |    0
 drivers/net/wireless/{ => intel}/iwlegacy/csr.h    |    0
 drivers/net/wireless/{ => intel}/iwlegacy/debug.c  |    0
 .../wireless/{ => intel}/iwlegacy/iwl-spectrum.h   |    0
 drivers/net/wireless/{ => intel}/iwlegacy/prph.h   |    0
 25 files changed, 4 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-mac.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-calib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-mac.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/commands.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/common.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/common.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/csr.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/iwl-spectrum.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/prph.h (100%)
MAINTAINERS +1 -1
index b341dabeb579..83f9c2ba6962 100644
@@ -5641,7 +5641,7 @@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 M:	Stanislaw Gruszka <[email protected]>
 L:	[email protected]
 S:	Supported
-F:	drivers/net/wireless/iwlegacy/
+F:	drivers/net/wireless/intel/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:	Johannes Berg <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index 73e3b53caf45..f293831e2878 100644
@@ -163,7 +163,6 @@ config MWL8K
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/iwlegacy/Kconfig"
 source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
drivers/net/wireless/Makefile +0 -1
index 52946d8dd31d..135aa8753f69 100644
@@ -31,7 +31,6 @@ obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 
 obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
-obj-$(CONFIG_IWLEGACY)	+= iwlegacy/
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
drivers/net/wireless/intel/Kconfig +1 -0
index 3f8eacc4209a..0a7cd61e528c 100644
@@ -12,5 +12,6 @@ config WLAN_VENDOR_INTEL
 if WLAN_VENDOR_INTEL
 
 source "drivers/net/wireless/intel/ipw2x00/Kconfig"
+source "drivers/net/wireless/intel/iwlegacy/Kconfig"
 
 endif # WLAN_VENDOR_INTEL
drivers/net/wireless/intel/Makefile +2 -0
index 8e5dcb2d425e..cec507d3c6bf 100644
@@ -1,2 +1,4 @@
 obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
+
+obj-$(CONFIG_IWLEGACY)	+= iwlegacy/
drivers/net/wireless/intel/iwlegacy/3945-debug.c renamed from drivers/net/wireless/iwlegacy/3945-debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/3945-debug.c
rename to drivers/net/wireless/intel/iwlegacy/3945-debug.c
drivers/net/wireless/intel/iwlegacy/3945-mac.c renamed from drivers/net/wireless/iwlegacy/3945-mac.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/3945-mac.c
rename to drivers/net/wireless/intel/iwlegacy/3945-mac.c
drivers/net/wireless/intel/iwlegacy/3945-rs.c renamed from drivers/net/wireless/iwlegacy/3945-rs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/3945-rs.c
rename to drivers/net/wireless/intel/iwlegacy/3945-rs.c
drivers/net/wireless/intel/iwlegacy/3945.c renamed from drivers/net/wireless/iwlegacy/3945.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/3945.c
rename to drivers/net/wireless/intel/iwlegacy/3945.c
drivers/net/wireless/intel/iwlegacy/3945.h renamed from drivers/net/wireless/iwlegacy/3945.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/3945.h
rename to drivers/net/wireless/intel/iwlegacy/3945.h
drivers/net/wireless/intel/iwlegacy/4965-calib.c renamed from drivers/net/wireless/iwlegacy/4965-calib.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/4965-calib.c
rename to drivers/net/wireless/intel/iwlegacy/4965-calib.c
drivers/net/wireless/intel/iwlegacy/4965-debug.c renamed from drivers/net/wireless/iwlegacy/4965-debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/4965-debug.c
rename to drivers/net/wireless/intel/iwlegacy/4965-debug.c
drivers/net/wireless/intel/iwlegacy/4965-mac.c renamed from drivers/net/wireless/iwlegacy/4965-mac.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/4965-mac.c
rename to drivers/net/wireless/intel/iwlegacy/4965-mac.c
drivers/net/wireless/intel/iwlegacy/4965-rs.c renamed from drivers/net/wireless/iwlegacy/4965-rs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/4965-rs.c
rename to drivers/net/wireless/intel/iwlegacy/4965-rs.c
drivers/net/wireless/intel/iwlegacy/4965.c renamed from drivers/net/wireless/iwlegacy/4965.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/4965.c
rename to drivers/net/wireless/intel/iwlegacy/4965.c
drivers/net/wireless/intel/iwlegacy/4965.h renamed from drivers/net/wireless/iwlegacy/4965.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/4965.h
rename to drivers/net/wireless/intel/iwlegacy/4965.h
drivers/net/wireless/intel/iwlegacy/Kconfig renamed from drivers/net/wireless/iwlegacy/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/Kconfig
rename to drivers/net/wireless/intel/iwlegacy/Kconfig
drivers/net/wireless/intel/iwlegacy/Makefile renamed from drivers/net/wireless/iwlegacy/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/Makefile
rename to drivers/net/wireless/intel/iwlegacy/Makefile
drivers/net/wireless/intel/iwlegacy/commands.h renamed from drivers/net/wireless/iwlegacy/commands.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/commands.h
rename to drivers/net/wireless/intel/iwlegacy/commands.h
drivers/net/wireless/intel/iwlegacy/common.c renamed from drivers/net/wireless/iwlegacy/common.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/common.c
rename to drivers/net/wireless/intel/iwlegacy/common.c
drivers/net/wireless/intel/iwlegacy/common.h renamed from drivers/net/wireless/iwlegacy/common.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/common.h
rename to drivers/net/wireless/intel/iwlegacy/common.h
drivers/net/wireless/intel/iwlegacy/csr.h renamed from drivers/net/wireless/iwlegacy/csr.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/csr.h
rename to drivers/net/wireless/intel/iwlegacy/csr.h
drivers/net/wireless/intel/iwlegacy/debug.c renamed from drivers/net/wireless/iwlegacy/debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/debug.c
rename to drivers/net/wireless/intel/iwlegacy/debug.c
drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h renamed from drivers/net/wireless/iwlegacy/iwl-spectrum.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/iwl-spectrum.h
rename to drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h
drivers/net/wireless/intel/iwlegacy/prph.h renamed from drivers/net/wireless/iwlegacy/prph.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlegacy/prph.h
rename to drivers/net/wireless/intel/iwlegacy/prph.h
Signature · 1 line
1.7.9.5
author
#21 lore raw

PATCH v2 10/27 iwlwifi: move under intel vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    1 -
 drivers/net/wireless/intel/Kconfig                 |    1 +
 drivers/net/wireless/intel/Makefile                |    2 ++
 drivers/net/wireless/{ => intel}/iwlwifi/Kconfig   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/Makefile  |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/Makefile  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/calib.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/calib.h   |    0
 .../wireless/{ => intel}/iwlwifi/dvm/commands.h    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/devices.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c |    0
 .../wireless/{ => intel}/iwlwifi/dvm/mac80211.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/main.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/power.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/power.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/rxon.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/scan.c    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/dvm/ucode.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-1000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-2000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-5000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-6000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-7000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-8000.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h  |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-config.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-debug.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-debug.h   |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-data.h        |    0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h     |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-msg.h         |    0
 .../{ => intel}/iwlwifi/iwl-devtrace-ucode.h       |    0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace.c    |    0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace.h    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h |    0
 .../{ => intel}/iwlwifi/iwl-eeprom-parse.c         |    0
 .../{ => intel}/iwlwifi/iwl-eeprom-parse.h         |    0
 .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c |    0
 .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h  |    0
 .../{ => intel}/iwlwifi/iwl-fw-error-dump.h        |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h  |    0
 .../wireless/{ => intel}/iwlwifi/iwl-modparams.h   |    0
 .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.c  |    0
 .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.h  |    0
 .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c   |    0
 .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h  |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-prph.h    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-trans.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/iwl-trans.h   |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/Makefile  |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/binding.c |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/coex.c    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/constants.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c  |    0
 .../wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h   |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h  |    0
 .../{ => intel}/iwlwifi/mvm/fw-api-power.h         |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h   |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h   |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h  |    0
 .../{ => intel}/iwlwifi/mvm/fw-api-stats.h         |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h  |    0
 .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h   |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/mac80211.c    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/offloading.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c |    0
 .../wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c    |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/power.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/quota.c   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/scan.c    |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/tdls.c    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/testmode.h    |    0
 .../wireless/{ => intel}/iwlwifi/mvm/time-event.c  |    0
 .../wireless/{ => intel}/iwlwifi/mvm/time-event.h  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c  |    0
 .../net/wireless/{ => intel}/iwlwifi/mvm/utils.c   |    0
 .../net/wireless/{ => intel}/iwlwifi/pcie/drv.c    |    0
 .../wireless/{ => intel}/iwlwifi/pcie/internal.h   |    0
 drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c |    0
 .../net/wireless/{ => intel}/iwlwifi/pcie/trans.c  |    0
 drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c |    0
 127 files changed, 4 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => intel}/iwlwifi/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/commands.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/devices.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/mac80211.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/main.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rxon.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/scan.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/ucode.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-1000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-2000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-5000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-6000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-7000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-8000.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-config.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-data.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-msg.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-ucode.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-error-dump.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-modparams.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-prph.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/binding.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/constants.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-power.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-stats.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac80211.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/offloading.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/power.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/quota.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/scan.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tdls.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/testmode.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/utils.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/drv.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/internal.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/trans.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c (100%)
MAINTAINERS +1 -1
index 83f9c2ba6962..d72be8c88138 100644
@@ -5651,7 +5651,7 @@ L:	[email protected]
 W:	http://intellinuxwireless.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:	Supported
-F:	drivers/net/wireless/iwlwifi/
+F:	drivers/net/wireless/intel/iwlwifi/
 
 INTEL MANAGEMENT ENGINE (mei)
 M:	Tomas Winkler <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index f293831e2878..d71efe89970b 100644
@@ -162,7 +162,6 @@ config MWL8K
 
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
 source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
drivers/net/wireless/Makefile +0 -1
index 135aa8753f69..6bcb2925a6ce 100644
@@ -30,7 +30,6 @@ obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
 
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 
-obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
drivers/net/wireless/intel/Kconfig +1 -0
index 0a7cd61e528c..5b14f2f64a8a 100644
@@ -13,5 +13,6 @@ if WLAN_VENDOR_INTEL
 
 source "drivers/net/wireless/intel/ipw2x00/Kconfig"
 source "drivers/net/wireless/intel/iwlegacy/Kconfig"
+source "drivers/net/wireless/intel/iwlwifi/Kconfig"
 
 endif # WLAN_VENDOR_INTEL
drivers/net/wireless/intel/Makefile +2 -0
index cec507d3c6bf..c9cbcc85b569 100644
@@ -2,3 +2,5 @@ obj-$(CONFIG_IPW2100) += ipw2x00/
 obj-$(CONFIG_IPW2200) += ipw2x00/
 
 obj-$(CONFIG_IWLEGACY)	+= iwlegacy/
+
+obj-$(CONFIG_IWLWIFI)	+= iwlwifi/
drivers/net/wireless/intel/iwlwifi/Kconfig renamed from drivers/net/wireless/iwlwifi/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/Kconfig
rename to drivers/net/wireless/intel/iwlwifi/Kconfig
drivers/net/wireless/intel/iwlwifi/Makefile renamed from drivers/net/wireless/iwlwifi/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/Makefile
rename to drivers/net/wireless/intel/iwlwifi/Makefile
drivers/net/wireless/intel/iwlwifi/dvm/Makefile renamed from drivers/net/wireless/iwlwifi/dvm/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/Makefile
rename to drivers/net/wireless/intel/iwlwifi/dvm/Makefile
drivers/net/wireless/intel/iwlwifi/dvm/agn.h renamed from drivers/net/wireless/iwlwifi/dvm/agn.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/agn.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/agn.h
drivers/net/wireless/intel/iwlwifi/dvm/calib.c renamed from drivers/net/wireless/iwlwifi/dvm/calib.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/calib.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/calib.c
drivers/net/wireless/intel/iwlwifi/dvm/calib.h renamed from drivers/net/wireless/iwlwifi/dvm/calib.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/calib.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/calib.h
drivers/net/wireless/intel/iwlwifi/dvm/commands.h renamed from drivers/net/wireless/iwlwifi/dvm/commands.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/commands.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/commands.h
drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c renamed from drivers/net/wireless/iwlwifi/dvm/debugfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/debugfs.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
drivers/net/wireless/intel/iwlwifi/dvm/dev.h renamed from drivers/net/wireless/iwlwifi/dvm/dev.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/dev.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/dev.h
drivers/net/wireless/intel/iwlwifi/dvm/devices.c renamed from drivers/net/wireless/iwlwifi/dvm/devices.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/devices.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/devices.c
drivers/net/wireless/intel/iwlwifi/dvm/led.c renamed from drivers/net/wireless/iwlwifi/dvm/led.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/led.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/led.c
drivers/net/wireless/intel/iwlwifi/dvm/led.h renamed from drivers/net/wireless/iwlwifi/dvm/led.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/led.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/led.h
drivers/net/wireless/intel/iwlwifi/dvm/lib.c renamed from drivers/net/wireless/iwlwifi/dvm/lib.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/lib.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/lib.c
drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c renamed from drivers/net/wireless/iwlwifi/dvm/mac80211.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/mac80211.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/dvm/main.c renamed from drivers/net/wireless/iwlwifi/dvm/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/main.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/main.c
drivers/net/wireless/intel/iwlwifi/dvm/power.c renamed from drivers/net/wireless/iwlwifi/dvm/power.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/power.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/power.c
drivers/net/wireless/intel/iwlwifi/dvm/power.h renamed from drivers/net/wireless/iwlwifi/dvm/power.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/power.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/power.h
drivers/net/wireless/intel/iwlwifi/dvm/rs.c renamed from drivers/net/wireless/iwlwifi/dvm/rs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/rs.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/rs.c
drivers/net/wireless/intel/iwlwifi/dvm/rs.h renamed from drivers/net/wireless/iwlwifi/dvm/rs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/rs.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/rs.h
drivers/net/wireless/intel/iwlwifi/dvm/rx.c renamed from drivers/net/wireless/iwlwifi/dvm/rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/rx.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/rx.c
drivers/net/wireless/intel/iwlwifi/dvm/rxon.c renamed from drivers/net/wireless/iwlwifi/dvm/rxon.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/rxon.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/rxon.c
drivers/net/wireless/intel/iwlwifi/dvm/scan.c renamed from drivers/net/wireless/iwlwifi/dvm/scan.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/scan.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/scan.c
drivers/net/wireless/intel/iwlwifi/dvm/sta.c renamed from drivers/net/wireless/iwlwifi/dvm/sta.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/sta.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/sta.c
drivers/net/wireless/intel/iwlwifi/dvm/tt.c renamed from drivers/net/wireless/iwlwifi/dvm/tt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/tt.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/tt.c
drivers/net/wireless/intel/iwlwifi/dvm/tt.h renamed from drivers/net/wireless/iwlwifi/dvm/tt.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/tt.h
rename to drivers/net/wireless/intel/iwlwifi/dvm/tt.h
drivers/net/wireless/intel/iwlwifi/dvm/tx.c renamed from drivers/net/wireless/iwlwifi/dvm/tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/tx.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/tx.c
drivers/net/wireless/intel/iwlwifi/dvm/ucode.c renamed from drivers/net/wireless/iwlwifi/dvm/ucode.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/dvm/ucode.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/ucode.c
drivers/net/wireless/intel/iwlwifi/iwl-1000.c renamed from drivers/net/wireless/iwlwifi/iwl-1000.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-1000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-1000.c
drivers/net/wireless/intel/iwlwifi/iwl-2000.c renamed from drivers/net/wireless/iwlwifi/iwl-2000.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-2000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-2000.c
drivers/net/wireless/intel/iwlwifi/iwl-5000.c renamed from drivers/net/wireless/iwlwifi/iwl-5000.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-5000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-5000.c
drivers/net/wireless/intel/iwlwifi/iwl-6000.c renamed from drivers/net/wireless/iwlwifi/iwl-6000.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-6000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-6000.c
drivers/net/wireless/intel/iwlwifi/iwl-7000.c renamed from drivers/net/wireless/iwlwifi/iwl-7000.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-7000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-7000.c
drivers/net/wireless/intel/iwlwifi/iwl-8000.c renamed from drivers/net/wireless/iwlwifi/iwl-8000.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-8000.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-8000.c
drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h renamed from drivers/net/wireless/iwlwifi/iwl-agn-hw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-agn-hw.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h
drivers/net/wireless/intel/iwlwifi/iwl-config.h renamed from drivers/net/wireless/iwlwifi/iwl-config.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-config.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-config.h
drivers/net/wireless/intel/iwlwifi/iwl-csr.h renamed from drivers/net/wireless/iwlwifi/iwl-csr.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-csr.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-csr.h
drivers/net/wireless/intel/iwlwifi/iwl-debug.c renamed from drivers/net/wireless/iwlwifi/iwl-debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-debug.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-debug.c
drivers/net/wireless/intel/iwlwifi/iwl-debug.h renamed from drivers/net/wireless/iwlwifi/iwl-debug.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-debug.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-debug.h
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h renamed from drivers/net/wireless/iwlwifi/iwl-devtrace-data.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace-data.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h renamed from drivers/net/wireless/iwlwifi/iwl-devtrace-io.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace-io.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h renamed from drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h renamed from drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h
drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h renamed from drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h
drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c renamed from drivers/net/wireless/iwlwifi/iwl-devtrace.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c
drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h renamed from drivers/net/wireless/iwlwifi/iwl-devtrace.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-devtrace.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h
drivers/net/wireless/intel/iwlwifi/iwl-drv.c renamed from drivers/net/wireless/iwlwifi/iwl-drv.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-drv.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-drv.c
drivers/net/wireless/intel/iwlwifi/iwl-drv.h renamed from drivers/net/wireless/iwlwifi/iwl-drv.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-drv.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-drv.h
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c renamed from drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h renamed from drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c renamed from drivers/net/wireless/iwlwifi/iwl-eeprom-read.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h renamed from drivers/net/wireless/iwlwifi/iwl-eeprom-read.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h
drivers/net/wireless/intel/iwlwifi/iwl-fh.h renamed from drivers/net/wireless/iwlwifi/iwl-fh.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-fh.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-fh.h
drivers/net/wireless/intel/iwlwifi/iwl-fw-error-dump.h renamed from drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-fw-error-dump.h
drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h renamed from drivers/net/wireless/iwlwifi/iwl-fw-file.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-fw-file.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
drivers/net/wireless/intel/iwlwifi/iwl-fw.h renamed from drivers/net/wireless/iwlwifi/iwl-fw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-fw.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-fw.h
drivers/net/wireless/intel/iwlwifi/iwl-io.c renamed from drivers/net/wireless/iwlwifi/iwl-io.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-io.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-io.c
drivers/net/wireless/intel/iwlwifi/iwl-io.h renamed from drivers/net/wireless/iwlwifi/iwl-io.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-io.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-io.h
drivers/net/wireless/intel/iwlwifi/iwl-modparams.h renamed from drivers/net/wireless/iwlwifi/iwl-modparams.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-modparams.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c renamed from drivers/net/wireless/iwlwifi/iwl-notif-wait.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-notif-wait.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c
drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h renamed from drivers/net/wireless/iwlwifi/iwl-notif-wait.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-notif-wait.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c renamed from drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-nvm-parse.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h renamed from drivers/net/wireless/iwlwifi/iwl-nvm-parse.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h
drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h renamed from drivers/net/wireless/iwlwifi/iwl-op-mode.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-op-mode.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c renamed from drivers/net/wireless/iwlwifi/iwl-phy-db.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-phy-db.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c
drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h renamed from drivers/net/wireless/iwlwifi/iwl-phy-db.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-phy-db.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h
drivers/net/wireless/intel/iwlwifi/iwl-prph.h renamed from drivers/net/wireless/iwlwifi/iwl-prph.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-prph.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-prph.h
drivers/net/wireless/intel/iwlwifi/iwl-scd.h renamed from drivers/net/wireless/iwlwifi/iwl-scd.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-scd.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-scd.h
drivers/net/wireless/intel/iwlwifi/iwl-trans.c renamed from drivers/net/wireless/iwlwifi/iwl-trans.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-trans.c
rename to drivers/net/wireless/intel/iwlwifi/iwl-trans.c
drivers/net/wireless/intel/iwlwifi/iwl-trans.h renamed from drivers/net/wireless/iwlwifi/iwl-trans.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/iwl-trans.h
rename to drivers/net/wireless/intel/iwlwifi/iwl-trans.h
drivers/net/wireless/intel/iwlwifi/mvm/Makefile renamed from drivers/net/wireless/iwlwifi/mvm/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/Makefile
rename to drivers/net/wireless/intel/iwlwifi/mvm/Makefile
drivers/net/wireless/intel/iwlwifi/mvm/binding.c renamed from drivers/net/wireless/iwlwifi/mvm/binding.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/binding.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/binding.c
drivers/net/wireless/intel/iwlwifi/mvm/coex.c renamed from drivers/net/wireless/iwlwifi/mvm/coex.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/coex.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/coex.c
drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c renamed from drivers/net/wireless/iwlwifi/mvm/coex_legacy.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c
drivers/net/wireless/intel/iwlwifi/mvm/constants.h renamed from drivers/net/wireless/iwlwifi/mvm/constants.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/constants.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/constants.h
drivers/net/wireless/intel/iwlwifi/mvm/d3.c renamed from drivers/net/wireless/iwlwifi/mvm/d3.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/d3.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/d3.c
drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c renamed from drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c renamed from drivers/net/wireless/iwlwifi/mvm/debugfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/debugfs.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h renamed from drivers/net/wireless/iwlwifi/mvm/debugfs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/debugfs.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-coex.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-coex.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-power.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-power.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-power.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-power.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-stats.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-stats.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tof.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-tof.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-tof.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tof.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h
drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h renamed from drivers/net/wireless/iwlwifi/mvm/fw-api.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw-api.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h
drivers/net/wireless/intel/iwlwifi/mvm/fw.c renamed from drivers/net/wireless/iwlwifi/mvm/fw.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/fw.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/fw.c
drivers/net/wireless/intel/iwlwifi/mvm/led.c renamed from drivers/net/wireless/iwlwifi/mvm/led.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/led.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/led.c
drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c renamed from drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c renamed from drivers/net/wireless/iwlwifi/mvm/mac80211.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/mac80211.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h renamed from drivers/net/wireless/iwlwifi/mvm/mvm.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/mvm.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c renamed from drivers/net/wireless/iwlwifi/mvm/nvm.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/nvm.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
drivers/net/wireless/intel/iwlwifi/mvm/offloading.c renamed from drivers/net/wireless/iwlwifi/mvm/offloading.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/offloading.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/offloading.c
drivers/net/wireless/intel/iwlwifi/mvm/ops.c renamed from drivers/net/wireless/iwlwifi/mvm/ops.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/ops.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/ops.c
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c renamed from drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
drivers/net/wireless/intel/iwlwifi/mvm/power.c renamed from drivers/net/wireless/iwlwifi/mvm/power.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/power.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/power.c
drivers/net/wireless/intel/iwlwifi/mvm/quota.c renamed from drivers/net/wireless/iwlwifi/mvm/quota.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/quota.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/quota.c
drivers/net/wireless/intel/iwlwifi/mvm/rs.c renamed from drivers/net/wireless/iwlwifi/mvm/rs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/rs.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/rs.c
drivers/net/wireless/intel/iwlwifi/mvm/rs.h renamed from drivers/net/wireless/iwlwifi/mvm/rs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/rs.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/rs.h
drivers/net/wireless/intel/iwlwifi/mvm/rx.c renamed from drivers/net/wireless/iwlwifi/mvm/rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/rx.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/rx.c
drivers/net/wireless/intel/iwlwifi/mvm/scan.c renamed from drivers/net/wireless/iwlwifi/mvm/scan.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/scan.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/scan.c
drivers/net/wireless/intel/iwlwifi/mvm/sf.c renamed from drivers/net/wireless/iwlwifi/mvm/sf.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/sf.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/sf.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c renamed from drivers/net/wireless/iwlwifi/mvm/sta.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/sta.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.h renamed from drivers/net/wireless/iwlwifi/mvm/sta.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/sta.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/sta.h
drivers/net/wireless/intel/iwlwifi/mvm/tdls.c renamed from drivers/net/wireless/iwlwifi/mvm/tdls.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/tdls.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/tdls.c
drivers/net/wireless/intel/iwlwifi/mvm/testmode.h renamed from drivers/net/wireless/iwlwifi/mvm/testmode.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/testmode.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/testmode.h
drivers/net/wireless/intel/iwlwifi/mvm/time-event.c renamed from drivers/net/wireless/iwlwifi/mvm/time-event.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/time-event.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/time-event.c
drivers/net/wireless/intel/iwlwifi/mvm/time-event.h renamed from drivers/net/wireless/iwlwifi/mvm/time-event.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/time-event.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/time-event.h
drivers/net/wireless/intel/iwlwifi/mvm/tof.c renamed from drivers/net/wireless/iwlwifi/mvm/tof.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/tof.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/tof.c
drivers/net/wireless/intel/iwlwifi/mvm/tof.h renamed from drivers/net/wireless/iwlwifi/mvm/tof.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/tof.h
rename to drivers/net/wireless/intel/iwlwifi/mvm/tof.h
drivers/net/wireless/intel/iwlwifi/mvm/tt.c renamed from drivers/net/wireless/iwlwifi/mvm/tt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/tt.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/tt.c
drivers/net/wireless/intel/iwlwifi/mvm/tx.c renamed from drivers/net/wireless/iwlwifi/mvm/tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/tx.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/tx.c
drivers/net/wireless/intel/iwlwifi/mvm/utils.c renamed from drivers/net/wireless/iwlwifi/mvm/utils.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/mvm/utils.c
rename to drivers/net/wireless/intel/iwlwifi/mvm/utils.c
drivers/net/wireless/intel/iwlwifi/pcie/drv.c renamed from drivers/net/wireless/iwlwifi/pcie/drv.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/pcie/drv.c
rename to drivers/net/wireless/intel/iwlwifi/pcie/drv.c
drivers/net/wireless/intel/iwlwifi/pcie/internal.h renamed from drivers/net/wireless/iwlwifi/pcie/internal.h +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/pcie/internal.h
rename to drivers/net/wireless/intel/iwlwifi/pcie/internal.h
drivers/net/wireless/intel/iwlwifi/pcie/rx.c renamed from drivers/net/wireless/iwlwifi/pcie/rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/pcie/rx.c
rename to drivers/net/wireless/intel/iwlwifi/pcie/rx.c
drivers/net/wireless/intel/iwlwifi/pcie/trans.c renamed from drivers/net/wireless/iwlwifi/pcie/trans.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/pcie/trans.c
rename to drivers/net/wireless/intel/iwlwifi/pcie/trans.c
drivers/net/wireless/intel/iwlwifi/pcie/tx.c renamed from drivers/net/wireless/iwlwifi/pcie/tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/iwlwifi/pcie/tx.c
rename to drivers/net/wireless/intel/iwlwifi/pcie/tx.c
Signature · 1 line
1.7.9.5
#22 lore raw

Re: [PATCH v2 10/27] iwlwifi: move under intel vendor directory

Hi Kalle,

Quoted 3 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

I am sorry but I'd prefer to wait with this. We have a big machinery of scripts / builds and alike that will break. I did give a heads up a while ago to the people in charge of these scripts that this change is on the way, but they are not done yet. I will get back to them and ask them when we can be ready for such a change and then it'll come from my tree. I promise to try to make it happen ASAP.
The above is relevant for iwlwifi only. As far as I am concerned, you can move the iwlwifi and ipw.

Thank you.

Quoted 3 lines
---
 MAINTAINERS                                        |    2 +-
maintainer
#23 lore raw

Re: [PATCH v2 10/27] iwlwifi: move under intel vendor directory

From: Emmanuel Grumbach <[email protected]>
Date: Wed, 18 Nov 2015 23:21:31 +0200

Quoted 2 lines

I am sorry but I'd prefer to wait with this. We have a big machinery of scripts / builds and alike that will break.

Sorry, that's not a reason to stop this reorganization.

author
#24 lore raw

PATCH v2 11/27 libertas: move under marvell vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    2 +-
 drivers/net/wireless/Makefile                      |    2 +-
 drivers/net/wireless/marvell/Kconfig               |   16 ++++++++++++++++
 drivers/net/wireless/marvell/Makefile              |    1 +
 .../net/wireless/{ => marvell}/libertas/Kconfig    |    0
 .../net/wireless/{ => marvell}/libertas/LICENSE    |    0
 .../net/wireless/{ => marvell}/libertas/Makefile   |    0
 drivers/net/wireless/{ => marvell}/libertas/README |    0
 drivers/net/wireless/{ => marvell}/libertas/cfg.c  |    0
 drivers/net/wireless/{ => marvell}/libertas/cfg.h  |    0
 drivers/net/wireless/{ => marvell}/libertas/cmd.c  |    0
 drivers/net/wireless/{ => marvell}/libertas/cmd.h  |    0
 .../net/wireless/{ => marvell}/libertas/cmdresp.c  |    0
 .../net/wireless/{ => marvell}/libertas/debugfs.c  |    0
 .../net/wireless/{ => marvell}/libertas/debugfs.h  |    0
 drivers/net/wireless/{ => marvell}/libertas/decl.h |    0
 drivers/net/wireless/{ => marvell}/libertas/defs.h |    0
 drivers/net/wireless/{ => marvell}/libertas/dev.h  |    0
 .../net/wireless/{ => marvell}/libertas/ethtool.c  |    0
 .../net/wireless/{ => marvell}/libertas/firmware.c |    0
 drivers/net/wireless/{ => marvell}/libertas/host.h |    0
 .../net/wireless/{ => marvell}/libertas/if_cs.c    |    0
 .../net/wireless/{ => marvell}/libertas/if_sdio.c  |    0
 .../net/wireless/{ => marvell}/libertas/if_sdio.h  |    0
 .../net/wireless/{ => marvell}/libertas/if_spi.c   |    0
 .../net/wireless/{ => marvell}/libertas/if_spi.h   |    0
 .../net/wireless/{ => marvell}/libertas/if_usb.c   |    0
 .../net/wireless/{ => marvell}/libertas/if_usb.h   |    0
 drivers/net/wireless/{ => marvell}/libertas/main.c |    0
 drivers/net/wireless/{ => marvell}/libertas/mesh.c |    0
 drivers/net/wireless/{ => marvell}/libertas/mesh.h |    0
 .../net/wireless/{ => marvell}/libertas/radiotap.h |    0
 drivers/net/wireless/{ => marvell}/libertas/rx.c   |    0
 drivers/net/wireless/{ => marvell}/libertas/tx.c   |    0
 .../net/wireless/{ => marvell}/libertas/types.h    |    0
 36 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/marvell/Kconfig
 create mode 100644 drivers/net/wireless/marvell/Makefile
 rename drivers/net/wireless/{ => marvell}/libertas/Kconfig (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/LICENSE (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/README (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cfg.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cfg.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmd.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmdresp.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/debugfs.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/debugfs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/decl.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/defs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/dev.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/ethtool.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/firmware.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/host.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_cs.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_spi.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_spi.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/main.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/mesh.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/mesh.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/radiotap.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/rx.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/tx.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/types.h (100%)
MAINTAINERS +1 -1
index d72be8c88138..75ff7434db0e 100644
@@ -6708,7 +6708,7 @@ F:	drivers/net/ethernet/marvell/sk*
 MARVELL LIBERTAS WIRELESS DRIVER
 L:	[email protected]
 S:	Orphan
-F:	drivers/net/wireless/libertas/
+F:	drivers/net/wireless/marvell/libertas/
 
 MARVELL MV643XX ETHERNET DRIVER
 M:	Sebastian Hesselbarth <[email protected]>
drivers/net/wireless/Kconfig +1 -1
index d71efe89970b..b11a2d364200 100644
@@ -22,6 +22,7 @@ source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
+source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 
 config PCMCIA_RAYCS
@@ -162,7 +163,6 @@ config MWL8K
 
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
-source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
drivers/net/wireless/Makefile +1 -1
index 6bcb2925a6ce..a974a6edb4b6 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
+obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 
 obj-$(CONFIG_HERMES)		+= orinoco/
@@ -24,7 +25,6 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
-obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
 
drivers/net/wireless/marvell/Kconfig new file +16 -0
new file mode 100644
index 000000000000..7842096bea53
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_MARVELL
+	bool "Marvell devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_MARVELL
+
+source "drivers/net/wireless/marvell/libertas/Kconfig"
+
+endif # WLAN_VENDOR_MARVELL
drivers/net/wireless/marvell/Makefile new file +1 -0
new file mode 100644
index 000000000000..6f7ac46ded33
@@ -0,0 +1 @@
+obj-$(CONFIG_LIBERTAS)		+= libertas/
drivers/net/wireless/marvell/libertas/Kconfig renamed from drivers/net/wireless/libertas/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/Kconfig
rename to drivers/net/wireless/marvell/libertas/Kconfig
drivers/net/wireless/marvell/libertas/LICENSE renamed from drivers/net/wireless/libertas/LICENSE +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/LICENSE
rename to drivers/net/wireless/marvell/libertas/LICENSE
drivers/net/wireless/marvell/libertas/Makefile renamed from drivers/net/wireless/libertas/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/Makefile
rename to drivers/net/wireless/marvell/libertas/Makefile
drivers/net/wireless/marvell/libertas/README renamed from drivers/net/wireless/libertas/README +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/README
rename to drivers/net/wireless/marvell/libertas/README
drivers/net/wireless/marvell/libertas/cfg.c renamed from drivers/net/wireless/libertas/cfg.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/cfg.c
rename to drivers/net/wireless/marvell/libertas/cfg.c
drivers/net/wireless/marvell/libertas/cfg.h renamed from drivers/net/wireless/libertas/cfg.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/cfg.h
rename to drivers/net/wireless/marvell/libertas/cfg.h
drivers/net/wireless/marvell/libertas/cmd.c renamed from drivers/net/wireless/libertas/cmd.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/cmd.c
rename to drivers/net/wireless/marvell/libertas/cmd.c
drivers/net/wireless/marvell/libertas/cmd.h renamed from drivers/net/wireless/libertas/cmd.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/cmd.h
rename to drivers/net/wireless/marvell/libertas/cmd.h
drivers/net/wireless/marvell/libertas/cmdresp.c renamed from drivers/net/wireless/libertas/cmdresp.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/cmdresp.c
rename to drivers/net/wireless/marvell/libertas/cmdresp.c
drivers/net/wireless/marvell/libertas/debugfs.c renamed from drivers/net/wireless/libertas/debugfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/debugfs.c
rename to drivers/net/wireless/marvell/libertas/debugfs.c
drivers/net/wireless/marvell/libertas/debugfs.h renamed from drivers/net/wireless/libertas/debugfs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/debugfs.h
rename to drivers/net/wireless/marvell/libertas/debugfs.h
drivers/net/wireless/marvell/libertas/decl.h renamed from drivers/net/wireless/libertas/decl.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/decl.h
rename to drivers/net/wireless/marvell/libertas/decl.h
drivers/net/wireless/marvell/libertas/defs.h renamed from drivers/net/wireless/libertas/defs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/defs.h
rename to drivers/net/wireless/marvell/libertas/defs.h
drivers/net/wireless/marvell/libertas/dev.h renamed from drivers/net/wireless/libertas/dev.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/dev.h
rename to drivers/net/wireless/marvell/libertas/dev.h
drivers/net/wireless/marvell/libertas/ethtool.c renamed from drivers/net/wireless/libertas/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/ethtool.c
rename to drivers/net/wireless/marvell/libertas/ethtool.c
drivers/net/wireless/marvell/libertas/firmware.c renamed from drivers/net/wireless/libertas/firmware.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/firmware.c
rename to drivers/net/wireless/marvell/libertas/firmware.c
drivers/net/wireless/marvell/libertas/host.h renamed from drivers/net/wireless/libertas/host.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/host.h
rename to drivers/net/wireless/marvell/libertas/host.h
drivers/net/wireless/marvell/libertas/if_cs.c renamed from drivers/net/wireless/libertas/if_cs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_cs.c
rename to drivers/net/wireless/marvell/libertas/if_cs.c
drivers/net/wireless/marvell/libertas/if_sdio.c renamed from drivers/net/wireless/libertas/if_sdio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_sdio.c
rename to drivers/net/wireless/marvell/libertas/if_sdio.c
drivers/net/wireless/marvell/libertas/if_sdio.h renamed from drivers/net/wireless/libertas/if_sdio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_sdio.h
rename to drivers/net/wireless/marvell/libertas/if_sdio.h
drivers/net/wireless/marvell/libertas/if_spi.c renamed from drivers/net/wireless/libertas/if_spi.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_spi.c
rename to drivers/net/wireless/marvell/libertas/if_spi.c
drivers/net/wireless/marvell/libertas/if_spi.h renamed from drivers/net/wireless/libertas/if_spi.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_spi.h
rename to drivers/net/wireless/marvell/libertas/if_spi.h
drivers/net/wireless/marvell/libertas/if_usb.c renamed from drivers/net/wireless/libertas/if_usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_usb.c
rename to drivers/net/wireless/marvell/libertas/if_usb.c
drivers/net/wireless/marvell/libertas/if_usb.h renamed from drivers/net/wireless/libertas/if_usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/if_usb.h
rename to drivers/net/wireless/marvell/libertas/if_usb.h
drivers/net/wireless/marvell/libertas/main.c renamed from drivers/net/wireless/libertas/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/main.c
rename to drivers/net/wireless/marvell/libertas/main.c
drivers/net/wireless/marvell/libertas/mesh.c renamed from drivers/net/wireless/libertas/mesh.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/mesh.c
rename to drivers/net/wireless/marvell/libertas/mesh.c
drivers/net/wireless/marvell/libertas/mesh.h renamed from drivers/net/wireless/libertas/mesh.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/mesh.h
rename to drivers/net/wireless/marvell/libertas/mesh.h
drivers/net/wireless/marvell/libertas/radiotap.h renamed from drivers/net/wireless/libertas/radiotap.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/radiotap.h
rename to drivers/net/wireless/marvell/libertas/radiotap.h
drivers/net/wireless/marvell/libertas/rx.c renamed from drivers/net/wireless/libertas/rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/rx.c
rename to drivers/net/wireless/marvell/libertas/rx.c
drivers/net/wireless/marvell/libertas/tx.c renamed from drivers/net/wireless/libertas/tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/tx.c
rename to drivers/net/wireless/marvell/libertas/tx.c
drivers/net/wireless/marvell/libertas/types.h renamed from drivers/net/wireless/libertas/types.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas/types.h
rename to drivers/net/wireless/marvell/libertas/types.h
Signature · 1 line
1.7.9.5
author
#25 lore raw

PATCH v2 12/27 libertas_tf: move under marvell vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 drivers/net/wireless/Kconfig                       |   19 -------------------
 drivers/net/wireless/Makefile                      |    2 --
 drivers/net/wireless/marvell/Kconfig               |    1 +
 drivers/net/wireless/marvell/Makefile              |    2 ++
 drivers/net/wireless/marvell/libertas_tf/Kconfig   |   18 ++++++++++++++++++
 .../wireless/{ => marvell}/libertas_tf/Makefile    |    0
 .../net/wireless/{ => marvell}/libertas_tf/cmd.c   |    0
 .../wireless/{ => marvell}/libertas_tf/deb_defs.h  |    0
 .../wireless/{ => marvell}/libertas_tf/if_usb.c    |    0
 .../wireless/{ => marvell}/libertas_tf/if_usb.h    |    0
 .../{ => marvell}/libertas_tf/libertas_tf.h        |    0
 .../net/wireless/{ => marvell}/libertas_tf/main.c  |    0
 12 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 drivers/net/wireless/marvell/libertas_tf/Kconfig
 rename drivers/net/wireless/{ => marvell}/libertas_tf/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/deb_defs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/libertas_tf.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/main.c (100%)
drivers/net/wireless/Kconfig +0 -19
index b11a2d364200..25f52b32d725 100644
@@ -40,25 +40,6 @@ config PCMCIA_RAYCS
 	  To compile this driver as a module, choose M here: the module will be
 	  called ray_cs.  If unsure, say N.
 
-config LIBERTAS_THINFIRM
-	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
-	depends on MAC80211
-	select FW_LOADER
-	---help---
-	  A library for Marvell Libertas 8xxx devices using thinfirm.
-
-config LIBERTAS_THINFIRM_DEBUG
-	bool "Enable full debugging output in the Libertas thin firmware module."
-	depends on LIBERTAS_THINFIRM
-	---help---
-	  Debugging support.
-
-config LIBERTAS_THINFIRM_USB
-	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
-	depends on LIBERTAS_THINFIRM && USB
-	---help---
-	  A driver for Marvell Libertas 8388 USB devices using thinfirm.
-
 config PCMCIA_WL3501
 	tristate "Planet WL3501 PCMCIA cards"
 	depends on CFG80211 && PCMCIA
drivers/net/wireless/Makefile +0 -2
index a974a6edb4b6..72b167742ac7 100644
@@ -26,8 +26,6 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
 
-obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
-
 obj-$(CONFIG_MWL8K)	+= mwl8k.o
 
 obj-$(CONFIG_RT2X00)	+= rt2x00/
drivers/net/wireless/marvell/Kconfig +1 -0
index 7842096bea53..97ec8f35745e 100644
@@ -12,5 +12,6 @@ config WLAN_VENDOR_MARVELL
 if WLAN_VENDOR_MARVELL
 
 source "drivers/net/wireless/marvell/libertas/Kconfig"
+source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
 
 endif # WLAN_VENDOR_MARVELL
drivers/net/wireless/marvell/Makefile +2 -0
index 6f7ac46ded33..8f5eb423b71a 100644
@@ -1 +1,3 @@
 obj-$(CONFIG_LIBERTAS)		+= libertas/
+
+obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
drivers/net/wireless/marvell/libertas_tf/Kconfig new file +18 -0
new file mode 100644
index 000000000000..b5557af90048
@@ -0,0 +1,18 @@
+config LIBERTAS_THINFIRM
+	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
+	depends on MAC80211
+	select FW_LOADER
+	---help---
+	  A library for Marvell Libertas 8xxx devices using thinfirm.
+
+config LIBERTAS_THINFIRM_DEBUG
+	bool "Enable full debugging output in the Libertas thin firmware module."
+	depends on LIBERTAS_THINFIRM
+	---help---
+	  Debugging support.
+
+config LIBERTAS_THINFIRM_USB
+	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
+	depends on LIBERTAS_THINFIRM && USB
+	---help---
+	  A driver for Marvell Libertas 8388 USB devices using thinfirm.
drivers/net/wireless/marvell/libertas_tf/Makefile renamed from drivers/net/wireless/libertas_tf/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/Makefile
rename to drivers/net/wireless/marvell/libertas_tf/Makefile
drivers/net/wireless/marvell/libertas_tf/cmd.c renamed from drivers/net/wireless/libertas_tf/cmd.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/cmd.c
rename to drivers/net/wireless/marvell/libertas_tf/cmd.c
drivers/net/wireless/marvell/libertas_tf/deb_defs.h renamed from drivers/net/wireless/libertas_tf/deb_defs.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/deb_defs.h
rename to drivers/net/wireless/marvell/libertas_tf/deb_defs.h
drivers/net/wireless/marvell/libertas_tf/if_usb.c renamed from drivers/net/wireless/libertas_tf/if_usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/if_usb.c
rename to drivers/net/wireless/marvell/libertas_tf/if_usb.c
drivers/net/wireless/marvell/libertas_tf/if_usb.h renamed from drivers/net/wireless/libertas_tf/if_usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/if_usb.h
rename to drivers/net/wireless/marvell/libertas_tf/if_usb.h
drivers/net/wireless/marvell/libertas_tf/libertas_tf.h renamed from drivers/net/wireless/libertas_tf/libertas_tf.h +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/libertas_tf.h
rename to drivers/net/wireless/marvell/libertas_tf/libertas_tf.h
drivers/net/wireless/marvell/libertas_tf/main.c renamed from drivers/net/wireless/libertas_tf/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/libertas_tf/main.c
rename to drivers/net/wireless/marvell/libertas_tf/main.c
Signature · 1 line
1.7.9.5
author
#26 lore raw

PATCH v2 13/27 mwifiex: move under marvell vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    2 --
 drivers/net/wireless/marvell/Kconfig               |    1 +
 drivers/net/wireless/marvell/Makefile              |    1 +
 drivers/net/wireless/{ => marvell}/mwifiex/11ac.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11ac.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11h.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11n.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/11n.h   |    0
 .../net/wireless/{ => marvell}/mwifiex/11n_aggr.c  |    0
 .../net/wireless/{ => marvell}/mwifiex/11n_aggr.h  |    0
 .../wireless/{ => marvell}/mwifiex/11n_rxreorder.c |    0
 .../wireless/{ => marvell}/mwifiex/11n_rxreorder.h |    0
 drivers/net/wireless/{ => marvell}/mwifiex/Kconfig |    0
 .../net/wireless/{ => marvell}/mwifiex/Makefile    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/README  |    0
 .../net/wireless/{ => marvell}/mwifiex/cfg80211.c  |    0
 .../net/wireless/{ => marvell}/mwifiex/cfg80211.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/cfp.c   |    0
 .../net/wireless/{ => marvell}/mwifiex/cmdevt.c    |    0
 .../net/wireless/{ => marvell}/mwifiex/debugfs.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/decl.h  |    0
 .../net/wireless/{ => marvell}/mwifiex/ethtool.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/fw.h    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/ie.c    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/init.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h |    0
 drivers/net/wireless/{ => marvell}/mwifiex/join.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/main.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/main.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/pcie.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/pcie.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/scan.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/sdio.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/sdio.h  |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_cmd.c   |    0
 .../wireless/{ => marvell}/mwifiex/sta_cmdresp.c   |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_event.c |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_ioctl.c |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_rx.c    |    0
 .../net/wireless/{ => marvell}/mwifiex/sta_tx.c    |    0
 drivers/net/wireless/{ => marvell}/mwifiex/tdls.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/txrx.c  |    0
 .../net/wireless/{ => marvell}/mwifiex/uap_cmd.c   |    0
 .../net/wireless/{ => marvell}/mwifiex/uap_event.c |    0
 .../net/wireless/{ => marvell}/mwifiex/uap_txrx.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/usb.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/usb.h   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/util.c  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/util.h  |    0
 drivers/net/wireless/{ => marvell}/mwifiex/wmm.c   |    0
 drivers/net/wireless/{ => marvell}/mwifiex/wmm.h   |    0
 53 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11h.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/Kconfig (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/README (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfp.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cmdevt.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/debugfs.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/decl.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ethtool.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/fw.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ie.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/init.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/join.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/main.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/main.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/scan.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmdresp.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_event.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_ioctl.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_rx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/sta_tx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/tdls.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/txrx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/uap_cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/uap_event.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/uap_txrx.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/util.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/util.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.h (100%)
MAINTAINERS +1 -1
index 75ff7434db0e..5b889f6972c0 100644
@@ -6728,7 +6728,7 @@ M:	Amitkumar Karwar <[email protected]>
 M:	Nishant Sarmukadam <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/net/wireless/mwifiex/
+F:	drivers/net/wireless/marvell/mwifiex/
 
 MARVELL MWL8K WIRELESS DRIVER
 M:	Lennert Buytenhek <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index 25f52b32d725..465665237308 100644
@@ -152,7 +152,6 @@ source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
 source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/mwifiex/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN
drivers/net/wireless/Makefile +0 -2
index 72b167742ac7..7a95b58a5c76 100644
@@ -40,6 +40,4 @@ obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
 
 obj-$(CONFIG_WL_TI)	+= ti/
 
-obj-$(CONFIG_MWIFIEX)	+= mwifiex/
-
 obj-$(CONFIG_RSI_91X)	+= rsi/
drivers/net/wireless/marvell/Kconfig +1 -0
index 97ec8f35745e..bbdbac9a2a45 100644
@@ -13,5 +13,6 @@ if WLAN_VENDOR_MARVELL
 
 source "drivers/net/wireless/marvell/libertas/Kconfig"
 source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
+source "drivers/net/wireless/marvell/mwifiex/Kconfig"
 
 endif # WLAN_VENDOR_MARVELL
drivers/net/wireless/marvell/Makefile +1 -0
index 8f5eb423b71a..f4ab48aaff3c 100644
@@ -1,3 +1,4 @@
 obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
+obj-$(CONFIG_MWIFIEX)	+= mwifiex/
drivers/net/wireless/marvell/mwifiex/11ac.c renamed from drivers/net/wireless/mwifiex/11ac.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11ac.c
rename to drivers/net/wireless/marvell/mwifiex/11ac.c
drivers/net/wireless/marvell/mwifiex/11ac.h renamed from drivers/net/wireless/mwifiex/11ac.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11ac.h
rename to drivers/net/wireless/marvell/mwifiex/11ac.h
drivers/net/wireless/marvell/mwifiex/11h.c renamed from drivers/net/wireless/mwifiex/11h.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11h.c
rename to drivers/net/wireless/marvell/mwifiex/11h.c
drivers/net/wireless/marvell/mwifiex/11n.c renamed from drivers/net/wireless/mwifiex/11n.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11n.c
rename to drivers/net/wireless/marvell/mwifiex/11n.c
drivers/net/wireless/marvell/mwifiex/11n.h renamed from drivers/net/wireless/mwifiex/11n.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11n.h
rename to drivers/net/wireless/marvell/mwifiex/11n.h
drivers/net/wireless/marvell/mwifiex/11n_aggr.c renamed from drivers/net/wireless/mwifiex/11n_aggr.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11n_aggr.c
rename to drivers/net/wireless/marvell/mwifiex/11n_aggr.c
drivers/net/wireless/marvell/mwifiex/11n_aggr.h renamed from drivers/net/wireless/mwifiex/11n_aggr.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11n_aggr.h
rename to drivers/net/wireless/marvell/mwifiex/11n_aggr.h
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c renamed from drivers/net/wireless/mwifiex/11n_rxreorder.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11n_rxreorder.c
rename to drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h renamed from drivers/net/wireless/mwifiex/11n_rxreorder.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/11n_rxreorder.h
rename to drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h
drivers/net/wireless/marvell/mwifiex/Kconfig renamed from drivers/net/wireless/mwifiex/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/Kconfig
rename to drivers/net/wireless/marvell/mwifiex/Kconfig
drivers/net/wireless/marvell/mwifiex/Makefile renamed from drivers/net/wireless/mwifiex/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/Makefile
rename to drivers/net/wireless/marvell/mwifiex/Makefile
drivers/net/wireless/marvell/mwifiex/README renamed from drivers/net/wireless/mwifiex/README +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/README
rename to drivers/net/wireless/marvell/mwifiex/README
drivers/net/wireless/marvell/mwifiex/cfg80211.c renamed from drivers/net/wireless/mwifiex/cfg80211.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/cfg80211.c
rename to drivers/net/wireless/marvell/mwifiex/cfg80211.c
drivers/net/wireless/marvell/mwifiex/cfg80211.h renamed from drivers/net/wireless/mwifiex/cfg80211.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/cfg80211.h
rename to drivers/net/wireless/marvell/mwifiex/cfg80211.h
drivers/net/wireless/marvell/mwifiex/cfp.c renamed from drivers/net/wireless/mwifiex/cfp.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/cfp.c
rename to drivers/net/wireless/marvell/mwifiex/cfp.c
drivers/net/wireless/marvell/mwifiex/cmdevt.c renamed from drivers/net/wireless/mwifiex/cmdevt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/cmdevt.c
rename to drivers/net/wireless/marvell/mwifiex/cmdevt.c
drivers/net/wireless/marvell/mwifiex/debugfs.c renamed from drivers/net/wireless/mwifiex/debugfs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/debugfs.c
rename to drivers/net/wireless/marvell/mwifiex/debugfs.c
drivers/net/wireless/marvell/mwifiex/decl.h renamed from drivers/net/wireless/mwifiex/decl.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/decl.h
rename to drivers/net/wireless/marvell/mwifiex/decl.h
drivers/net/wireless/marvell/mwifiex/ethtool.c renamed from drivers/net/wireless/mwifiex/ethtool.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/ethtool.c
rename to drivers/net/wireless/marvell/mwifiex/ethtool.c
drivers/net/wireless/marvell/mwifiex/fw.h renamed from drivers/net/wireless/mwifiex/fw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/fw.h
rename to drivers/net/wireless/marvell/mwifiex/fw.h
drivers/net/wireless/marvell/mwifiex/ie.c renamed from drivers/net/wireless/mwifiex/ie.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/ie.c
rename to drivers/net/wireless/marvell/mwifiex/ie.c
drivers/net/wireless/marvell/mwifiex/init.c renamed from drivers/net/wireless/mwifiex/init.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/init.c
rename to drivers/net/wireless/marvell/mwifiex/init.c
drivers/net/wireless/marvell/mwifiex/ioctl.h renamed from drivers/net/wireless/mwifiex/ioctl.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/ioctl.h
rename to drivers/net/wireless/marvell/mwifiex/ioctl.h
drivers/net/wireless/marvell/mwifiex/join.c renamed from drivers/net/wireless/mwifiex/join.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/join.c
rename to drivers/net/wireless/marvell/mwifiex/join.c
drivers/net/wireless/marvell/mwifiex/main.c renamed from drivers/net/wireless/mwifiex/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/main.c
rename to drivers/net/wireless/marvell/mwifiex/main.c
drivers/net/wireless/marvell/mwifiex/main.h renamed from drivers/net/wireless/mwifiex/main.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/main.h
rename to drivers/net/wireless/marvell/mwifiex/main.h
drivers/net/wireless/marvell/mwifiex/pcie.c renamed from drivers/net/wireless/mwifiex/pcie.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/pcie.c
rename to drivers/net/wireless/marvell/mwifiex/pcie.c
drivers/net/wireless/marvell/mwifiex/pcie.h renamed from drivers/net/wireless/mwifiex/pcie.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/pcie.h
rename to drivers/net/wireless/marvell/mwifiex/pcie.h
drivers/net/wireless/marvell/mwifiex/scan.c renamed from drivers/net/wireless/mwifiex/scan.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/scan.c
rename to drivers/net/wireless/marvell/mwifiex/scan.c
drivers/net/wireless/marvell/mwifiex/sdio.c renamed from drivers/net/wireless/mwifiex/sdio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sdio.c
rename to drivers/net/wireless/marvell/mwifiex/sdio.c
drivers/net/wireless/marvell/mwifiex/sdio.h renamed from drivers/net/wireless/mwifiex/sdio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sdio.h
rename to drivers/net/wireless/marvell/mwifiex/sdio.h
drivers/net/wireless/marvell/mwifiex/sta_cmd.c renamed from drivers/net/wireless/mwifiex/sta_cmd.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sta_cmd.c
rename to drivers/net/wireless/marvell/mwifiex/sta_cmd.c
drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c renamed from drivers/net/wireless/mwifiex/sta_cmdresp.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sta_cmdresp.c
rename to drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
drivers/net/wireless/marvell/mwifiex/sta_event.c renamed from drivers/net/wireless/mwifiex/sta_event.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sta_event.c
rename to drivers/net/wireless/marvell/mwifiex/sta_event.c
drivers/net/wireless/marvell/mwifiex/sta_ioctl.c renamed from drivers/net/wireless/mwifiex/sta_ioctl.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sta_ioctl.c
rename to drivers/net/wireless/marvell/mwifiex/sta_ioctl.c
drivers/net/wireless/marvell/mwifiex/sta_rx.c renamed from drivers/net/wireless/mwifiex/sta_rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sta_rx.c
rename to drivers/net/wireless/marvell/mwifiex/sta_rx.c
drivers/net/wireless/marvell/mwifiex/sta_tx.c renamed from drivers/net/wireless/mwifiex/sta_tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/sta_tx.c
rename to drivers/net/wireless/marvell/mwifiex/sta_tx.c
drivers/net/wireless/marvell/mwifiex/tdls.c renamed from drivers/net/wireless/mwifiex/tdls.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/tdls.c
rename to drivers/net/wireless/marvell/mwifiex/tdls.c
drivers/net/wireless/marvell/mwifiex/txrx.c renamed from drivers/net/wireless/mwifiex/txrx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/txrx.c
rename to drivers/net/wireless/marvell/mwifiex/txrx.c
drivers/net/wireless/marvell/mwifiex/uap_cmd.c renamed from drivers/net/wireless/mwifiex/uap_cmd.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/uap_cmd.c
rename to drivers/net/wireless/marvell/mwifiex/uap_cmd.c
drivers/net/wireless/marvell/mwifiex/uap_event.c renamed from drivers/net/wireless/mwifiex/uap_event.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/uap_event.c
rename to drivers/net/wireless/marvell/mwifiex/uap_event.c
drivers/net/wireless/marvell/mwifiex/uap_txrx.c renamed from drivers/net/wireless/mwifiex/uap_txrx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/uap_txrx.c
rename to drivers/net/wireless/marvell/mwifiex/uap_txrx.c
drivers/net/wireless/marvell/mwifiex/usb.c renamed from drivers/net/wireless/mwifiex/usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/usb.c
rename to drivers/net/wireless/marvell/mwifiex/usb.c
drivers/net/wireless/marvell/mwifiex/usb.h renamed from drivers/net/wireless/mwifiex/usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/usb.h
rename to drivers/net/wireless/marvell/mwifiex/usb.h
drivers/net/wireless/marvell/mwifiex/util.c renamed from drivers/net/wireless/mwifiex/util.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/util.c
rename to drivers/net/wireless/marvell/mwifiex/util.c
drivers/net/wireless/marvell/mwifiex/util.h renamed from drivers/net/wireless/mwifiex/util.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/util.h
rename to drivers/net/wireless/marvell/mwifiex/util.h
drivers/net/wireless/marvell/mwifiex/wmm.c renamed from drivers/net/wireless/mwifiex/wmm.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/wmm.c
rename to drivers/net/wireless/marvell/mwifiex/wmm.c
drivers/net/wireless/marvell/mwifiex/wmm.h renamed from drivers/net/wireless/mwifiex/wmm.h +0 -0
similarity index 100%
rename from drivers/net/wireless/mwifiex/wmm.h
rename to drivers/net/wireless/marvell/mwifiex/wmm.h
Signature · 1 line
1.7.9.5
author
#27 lore raw

PATCH v2 14/27 mwl8k: move under marvell vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                |    2 +-
 drivers/net/wireless/Kconfig               |    9 ---------
 drivers/net/wireless/Makefile              |    2 --
 drivers/net/wireless/marvell/Kconfig       |    9 +++++++++
 drivers/net/wireless/marvell/Makefile      |    2 ++
 drivers/net/wireless/{ => marvell}/mwl8k.c |    0
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename drivers/net/wireless/{ => marvell}/mwl8k.c (100%)
MAINTAINERS +1 -1
index 5b889f6972c0..e622877aaab4 100644
@@ -6734,7 +6734,7 @@ MARVELL MWL8K WIRELESS DRIVER
 M:	Lennert Buytenhek <[email protected]>
 L:	[email protected]
 S:	Odd Fixes
-F:	drivers/net/wireless/mwl8k.c
+F:	drivers/net/wireless/marvell/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:	Nicolas Pitre <[email protected]>
drivers/net/wireless/Kconfig +0 -9
index 465665237308..315982a5ee73 100644
@@ -133,15 +133,6 @@ config MAC80211_HWSIM
 	  To compile this driver as a module, choose M here: the module will be
 	  called mac80211_hwsim.  If unsure, say N.
 
-config MWL8K
-	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
-	depends on MAC80211 && PCI
-	---help---
-	  This driver supports Marvell TOPDOG 802.11 wireless cards.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called mwl8k.  If unsure, say N.
-
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
drivers/net/wireless/Makefile +0 -2
index 7a95b58a5c76..9498753f596b 100644
@@ -26,8 +26,6 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
 
-obj-$(CONFIG_MWL8K)	+= mwl8k.o
-
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
drivers/net/wireless/marvell/Kconfig +9 -0
index bbdbac9a2a45..4938c7ec0009 100644
@@ -15,4 +15,13 @@ source "drivers/net/wireless/marvell/libertas/Kconfig"
 source "drivers/net/wireless/marvell/libertas_tf/Kconfig"
 source "drivers/net/wireless/marvell/mwifiex/Kconfig"
 
+config MWL8K
+	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
+	depends on MAC80211 && PCI
+	---help---
+	  This driver supports Marvell TOPDOG 802.11 wireless cards.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called mwl8k.  If unsure, say N.
+
 endif # WLAN_VENDOR_MARVELL
drivers/net/wireless/marvell/Makefile +2 -0
index f4ab48aaff3c..1b0a7d2bc8e6 100644
@@ -2,3 +2,5 @@ obj-$(CONFIG_LIBERTAS)		+= libertas/
 
 obj-$(CONFIG_LIBERTAS_THINFIRM)	+= libertas_tf/
 obj-$(CONFIG_MWIFIEX)	+= mwifiex/
+
+obj-$(CONFIG_MWL8K)	+= mwl8k.o
drivers/net/wireless/marvell/mwl8k.c renamed from drivers/net/wireless/mwl8k.c +0 -0
similarity index 100%
rename from drivers/net/wireless/mwl8k.c
rename to drivers/net/wireless/marvell/mwl8k.c
Signature · 1 line
1.7.9.5
author
#28 lore raw

PATCH v2 15/27 zd1201: move under zydas vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                               |    2 +-
 drivers/net/wireless/Kconfig              |   20 +----------------
 drivers/net/wireless/Makefile             |    3 +--
 drivers/net/wireless/zydas/Kconfig        |   33 +++++++++++++++++++++++++++++
 drivers/net/wireless/zydas/Makefile       |    1 +
 drivers/net/wireless/{ => zydas}/zd1201.c |    0
 drivers/net/wireless/{ => zydas}/zd1201.h |    0
 7 files changed, 37 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/wireless/zydas/Kconfig
 create mode 100644 drivers/net/wireless/zydas/Makefile
 rename drivers/net/wireless/{ => zydas}/zd1201.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1201.h (100%)
MAINTAINERS +1 -1
index e622877aaab4..ec098370ef3d 100644
@@ -11252,7 +11252,7 @@ USB ZD1201 DRIVER
 L:	[email protected]
 W:	http://linux-lc100020.sourceforge.net
 S:	Orphan
-F:	drivers/net/wireless/zd1201.*
+F:	drivers/net/wireless/zydas/zd1201.*
 
 USB ZR364XX DRIVER
 M:	Antoine Jacquet <[email protected]>
drivers/net/wireless/Kconfig +1 -19
index 315982a5ee73..35155e2dc8bf 100644
@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
+source "drivers/net/wireless/zydas/Kconfig"
 
 config PCMCIA_RAYCS
 	tristate "Aviator/Raytheon 2.4GHz wireless support"
@@ -70,25 +71,6 @@ config PRISM54
 
 	  When built as module you get the module prism54
 
-config USB_ZD1201
-	tristate "USB ZD1201 based Wireless device support"
-	depends on CFG80211 && USB
-	select WIRELESS_EXT
-	select WEXT_PRIV
-	select FW_LOADER
-	---help---
-	  Say Y if you want to use wireless LAN adapters based on the ZyDAS
-	  ZD1201 chip.
-
-	  This driver makes the adapter appear as a normal Ethernet interface,
-	  typically on wlan0.
-
-	  The zd1201 device requires external firmware to be loaded.
-	  This can be found at http://linux-lc100020.sourceforge.net/
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called zd1201.
-
 config USB_NET_RNDIS_WLAN
 	tristate "Wireless RNDIS USB support"
 	depends on USB
drivers/net/wireless/Makefile +1 -2
index 9498753f596b..4ee6d6d08743 100644
@@ -9,6 +9,7 @@ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
+obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
 obj-$(CONFIG_HERMES)		+= orinoco/
 
@@ -24,8 +25,6 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
-obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
-
 obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
drivers/net/wireless/zydas/Kconfig new file +33 -0
new file mode 100644
index 000000000000..6140dfa04fed
@@ -0,0 +1,33 @@
+config WLAN_VENDOR_ZYDAS
+	bool "ZyDAS devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_ZYDAS
+
+config USB_ZD1201
+	tristate "USB ZD1201 based Wireless device support"
+	depends on CFG80211 && USB
+	select WIRELESS_EXT
+	select WEXT_PRIV
+	select FW_LOADER
+	---help---
+	  Say Y if you want to use wireless LAN adapters based on the ZyDAS
+	  ZD1201 chip.
+
+	  This driver makes the adapter appear as a normal Ethernet interface,
+	  typically on wlan0.
+
+	  The zd1201 device requires external firmware to be loaded.
+	  This can be found at http://linux-lc100020.sourceforge.net/
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called zd1201.
+
+endif # WLAN_VENDOR_ZYDAS
drivers/net/wireless/zydas/Makefile new file +1 -0
new file mode 100644
index 000000000000..37179ef890ea
@@ -0,0 +1 @@
+obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
drivers/net/wireless/zydas/zd1201.c renamed from drivers/net/wireless/zd1201.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1201.c
rename to drivers/net/wireless/zydas/zd1201.c
drivers/net/wireless/zydas/zd1201.h renamed from drivers/net/wireless/zd1201.h +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1201.h
rename to drivers/net/wireless/zydas/zd1201.h
Signature · 1 line
1.7.9.5
author
#29 lore raw

PATCH v2 16/27 zd1211rw: move under zydas vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    1 -
 drivers/net/wireless/zydas/Kconfig                 |    2 ++
 drivers/net/wireless/zydas/Makefile                |    2 ++
 drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig  |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/Makefile |    0
 .../net/wireless/{ => zydas}/zd1211rw/zd_chip.c    |    0
 .../net/wireless/{ => zydas}/zd1211rw/zd_chip.h    |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c  |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h  |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c   |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c  |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c   |    0
 .../wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c   |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c |    0
 drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h |    0
 20 files changed, 5 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/Makefile (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c (100%)
 rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h (100%)
MAINTAINERS +1 -1
index ec098370ef3d..f2e78420488c 100644
@@ -11883,7 +11883,7 @@ W:	http://zd1211.ath.cx/wiki/DriverRewrite
 L:	[email protected]
 L:	[email protected] (subscribers-only)
 S:	Maintained
-F:	drivers/net/wireless/zd1211rw/
+F:	drivers/net/wireless/zydas/zd1211rw/
 
 ZPOOL COMPRESSED PAGE STORAGE API
 M:	Dan Streetman <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index 35155e2dc8bf..e86dcdd5cfcb 100644
@@ -124,7 +124,6 @@ source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
 source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN
drivers/net/wireless/Makefile +0 -1
index 4ee6d6d08743..8f54adde831e 100644
@@ -16,7 +16,6 @@ obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_HOSTAP)		+= hostap/
-obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
 obj-$(CONFIG_WLAN)		+= realtek/
 
 # 16-bit wireless PCMCIA client drivers
drivers/net/wireless/zydas/Kconfig +2 -0
index 6140dfa04fed..a58c0f65e376 100644
@@ -30,4 +30,6 @@ config USB_ZD1201
 	  To compile this driver as a module, choose M here: the
 	  module will be called zd1201.
 
+source "drivers/net/wireless/zydas/zd1211rw/Kconfig"
+
 endif # WLAN_VENDOR_ZYDAS
drivers/net/wireless/zydas/Makefile +2 -0
index 37179ef890ea..679fbbf3a6cd 100644
@@ -1 +1,3 @@
+obj-$(CONFIG_ZD1211RW)		+= zd1211rw/
+
 obj-$(CONFIG_USB_ZD1201)	+= zd1201.o
drivers/net/wireless/zydas/zd1211rw/Kconfig renamed from drivers/net/wireless/zd1211rw/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/Kconfig
rename to drivers/net/wireless/zydas/zd1211rw/Kconfig
drivers/net/wireless/zydas/zd1211rw/Makefile renamed from drivers/net/wireless/zd1211rw/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/Makefile
rename to drivers/net/wireless/zydas/zd1211rw/Makefile
drivers/net/wireless/zydas/zd1211rw/zd_chip.c renamed from drivers/net/wireless/zd1211rw/zd_chip.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_chip.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_chip.c
drivers/net/wireless/zydas/zd1211rw/zd_chip.h renamed from drivers/net/wireless/zd1211rw/zd_chip.h +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_chip.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_chip.h
drivers/net/wireless/zydas/zd1211rw/zd_def.h renamed from drivers/net/wireless/zd1211rw/zd_def.h +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_def.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_def.h
drivers/net/wireless/zydas/zd1211rw/zd_mac.c renamed from drivers/net/wireless/zd1211rw/zd_mac.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_mac.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_mac.c
drivers/net/wireless/zydas/zd1211rw/zd_mac.h renamed from drivers/net/wireless/zd1211rw/zd_mac.h +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_mac.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_mac.h
drivers/net/wireless/zydas/zd1211rw/zd_rf.c renamed from drivers/net/wireless/zd1211rw/zd_rf.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf.c
drivers/net/wireless/zydas/zd1211rw/zd_rf.h renamed from drivers/net/wireless/zd1211rw/zd_rf.h +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf.h
drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c renamed from drivers/net/wireless/zd1211rw/zd_rf_al2230.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_al2230.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c
drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c renamed from drivers/net/wireless/zd1211rw/zd_rf_al7230b.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_al7230b.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c
drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c renamed from drivers/net/wireless/zd1211rw/zd_rf_rf2959.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_rf2959.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c
drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c renamed from drivers/net/wireless/zd1211rw/zd_rf_uw2453.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_rf_uw2453.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c
drivers/net/wireless/zydas/zd1211rw/zd_usb.c renamed from drivers/net/wireless/zd1211rw/zd_usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_usb.c
rename to drivers/net/wireless/zydas/zd1211rw/zd_usb.c
drivers/net/wireless/zydas/zd1211rw/zd_usb.h renamed from drivers/net/wireless/zd1211rw/zd_usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/zd1211rw/zd_usb.h
rename to drivers/net/wireless/zydas/zd1211rw/zd_usb.h
Signature · 1 line
1.7.9.5
author
#30 lore raw

PATCH v2 17/27 hostap: move under intersil vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    2 +-
 drivers/net/wireless/Makefile                      |    2 +-
 drivers/net/wireless/intersil/Kconfig              |   16 ++++++++++++++++
 drivers/net/wireless/intersil/Makefile             |    1 +
 drivers/net/wireless/{ => intersil}/hostap/Kconfig |    0
 .../net/wireless/{ => intersil}/hostap/Makefile    |    0
 .../net/wireless/{ => intersil}/hostap/hostap.h    |    0
 .../wireless/{ => intersil}/hostap/hostap_80211.h  |    0
 .../{ => intersil}/hostap/hostap_80211_rx.c        |    0
 .../{ => intersil}/hostap/hostap_80211_tx.c        |    0
 .../net/wireless/{ => intersil}/hostap/hostap_ap.c |    0
 .../net/wireless/{ => intersil}/hostap/hostap_ap.h |    0
 .../wireless/{ => intersil}/hostap/hostap_common.h |    0
 .../wireless/{ => intersil}/hostap/hostap_config.h |    0
 .../net/wireless/{ => intersil}/hostap/hostap_cs.c |    0
 .../{ => intersil}/hostap/hostap_download.c        |    0
 .../net/wireless/{ => intersil}/hostap/hostap_hw.c |    0
 .../wireless/{ => intersil}/hostap/hostap_info.c   |    0
 .../wireless/{ => intersil}/hostap/hostap_ioctl.c  |    0
 .../wireless/{ => intersil}/hostap/hostap_main.c   |    0
 .../wireless/{ => intersil}/hostap/hostap_pci.c    |    0
 .../wireless/{ => intersil}/hostap/hostap_plx.c    |    0
 .../wireless/{ => intersil}/hostap/hostap_proc.c   |    0
 .../wireless/{ => intersil}/hostap/hostap_wlan.h   |    0
 25 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/intersil/Kconfig
 create mode 100644 drivers/net/wireless/intersil/Makefile
 rename drivers/net/wireless/{ => intersil}/hostap/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_rx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_tx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_common.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_config.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_download.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_hw.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_info.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ioctl.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_main.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_plx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_proc.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_wlan.h (100%)
MAINTAINERS +1 -1
index f2e78420488c..63c601b04e68 100644
@@ -5040,7 +5040,7 @@ L:	[email protected] (subscribers-only)
 L:	[email protected]
 W:	http://hostap.epitest.fi/
 S:	Maintained
-F:	drivers/net/wireless/hostap/
+F:	drivers/net/wireless/intersil/hostap/
 
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 L:	[email protected]
drivers/net/wireless/Kconfig +1 -1
index e86dcdd5cfcb..da10b00d8af1 100644
@@ -22,6 +22,7 @@ source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
+source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
@@ -116,7 +117,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
drivers/net/wireless/Makefile +1 -1
index 8f54adde831e..a60c5e55b55e 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
+obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
@@ -15,7 +16,6 @@ obj-$(CONFIG_HERMES)		+= orinoco/
 
 obj-$(CONFIG_PRISM54)		+= prism54/
 
-obj-$(CONFIG_HOSTAP)		+= hostap/
 obj-$(CONFIG_WLAN)		+= realtek/
 
 # 16-bit wireless PCMCIA client drivers
drivers/net/wireless/intersil/Kconfig new file +16 -0
new file mode 100644
index 000000000000..ec80b9117fd2
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_INTERSIL
+	bool "Intersil devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_INTERSIL
+
+source "drivers/net/wireless/intersil/hostap/Kconfig"
+
+endif # WLAN_VENDOR_INTERSIL
drivers/net/wireless/intersil/Makefile new file +1 -0
new file mode 100644
index 000000000000..4890ef79f280
@@ -0,0 +1 @@
+obj-$(CONFIG_HOSTAP)		+= hostap/
drivers/net/wireless/intersil/hostap/Kconfig renamed from drivers/net/wireless/hostap/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/Kconfig
rename to drivers/net/wireless/intersil/hostap/Kconfig
drivers/net/wireless/intersil/hostap/Makefile renamed from drivers/net/wireless/hostap/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/Makefile
rename to drivers/net/wireless/intersil/hostap/Makefile
drivers/net/wireless/intersil/hostap/hostap.h renamed from drivers/net/wireless/hostap/hostap.h +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap.h
rename to drivers/net/wireless/intersil/hostap/hostap.h
drivers/net/wireless/intersil/hostap/hostap_80211.h renamed from drivers/net/wireless/hostap/hostap_80211.h +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_80211.h
rename to drivers/net/wireless/intersil/hostap/hostap_80211.h
drivers/net/wireless/intersil/hostap/hostap_80211_rx.c renamed from drivers/net/wireless/hostap/hostap_80211_rx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_80211_rx.c
rename to drivers/net/wireless/intersil/hostap/hostap_80211_rx.c
drivers/net/wireless/intersil/hostap/hostap_80211_tx.c renamed from drivers/net/wireless/hostap/hostap_80211_tx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_80211_tx.c
rename to drivers/net/wireless/intersil/hostap/hostap_80211_tx.c
drivers/net/wireless/intersil/hostap/hostap_ap.c renamed from drivers/net/wireless/hostap/hostap_ap.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_ap.c
rename to drivers/net/wireless/intersil/hostap/hostap_ap.c
drivers/net/wireless/intersil/hostap/hostap_ap.h renamed from drivers/net/wireless/hostap/hostap_ap.h +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_ap.h
rename to drivers/net/wireless/intersil/hostap/hostap_ap.h
drivers/net/wireless/intersil/hostap/hostap_common.h renamed from drivers/net/wireless/hostap/hostap_common.h +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_common.h
rename to drivers/net/wireless/intersil/hostap/hostap_common.h
drivers/net/wireless/intersil/hostap/hostap_config.h renamed from drivers/net/wireless/hostap/hostap_config.h +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_config.h
rename to drivers/net/wireless/intersil/hostap/hostap_config.h
drivers/net/wireless/intersil/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_cs.c
rename to drivers/net/wireless/intersil/hostap/hostap_cs.c
drivers/net/wireless/intersil/hostap/hostap_download.c renamed from drivers/net/wireless/hostap/hostap_download.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_download.c
rename to drivers/net/wireless/intersil/hostap/hostap_download.c
drivers/net/wireless/intersil/hostap/hostap_hw.c renamed from drivers/net/wireless/hostap/hostap_hw.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_hw.c
rename to drivers/net/wireless/intersil/hostap/hostap_hw.c
drivers/net/wireless/intersil/hostap/hostap_info.c renamed from drivers/net/wireless/hostap/hostap_info.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_info.c
rename to drivers/net/wireless/intersil/hostap/hostap_info.c
drivers/net/wireless/intersil/hostap/hostap_ioctl.c renamed from drivers/net/wireless/hostap/hostap_ioctl.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_ioctl.c
rename to drivers/net/wireless/intersil/hostap/hostap_ioctl.c
drivers/net/wireless/intersil/hostap/hostap_main.c renamed from drivers/net/wireless/hostap/hostap_main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_main.c
rename to drivers/net/wireless/intersil/hostap/hostap_main.c
drivers/net/wireless/intersil/hostap/hostap_pci.c renamed from drivers/net/wireless/hostap/hostap_pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_pci.c
rename to drivers/net/wireless/intersil/hostap/hostap_pci.c
drivers/net/wireless/intersil/hostap/hostap_plx.c renamed from drivers/net/wireless/hostap/hostap_plx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_plx.c
rename to drivers/net/wireless/intersil/hostap/hostap_plx.c
drivers/net/wireless/intersil/hostap/hostap_proc.c renamed from drivers/net/wireless/hostap/hostap_proc.c +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_proc.c
rename to drivers/net/wireless/intersil/hostap/hostap_proc.c
drivers/net/wireless/intersil/hostap/hostap_wlan.h renamed from drivers/net/wireless/hostap/hostap_wlan.h +0 -0
similarity index 100%
rename from drivers/net/wireless/hostap/hostap_wlan.h
rename to drivers/net/wireless/intersil/hostap/hostap_wlan.h
Signature · 1 line
1.7.9.5
author
#31 lore raw

PATCH v2 18/27 p54: move under intersil vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    2 --
 drivers/net/wireless/intersil/Kconfig              |    1 +
 drivers/net/wireless/intersil/Makefile             |    1 +
 drivers/net/wireless/{ => intersil}/p54/Kconfig    |    0
 drivers/net/wireless/{ => intersil}/p54/Makefile   |    0
 drivers/net/wireless/{ => intersil}/p54/eeprom.c   |    0
 drivers/net/wireless/{ => intersil}/p54/eeprom.h   |    0
 drivers/net/wireless/{ => intersil}/p54/fwio.c     |    0
 drivers/net/wireless/{ => intersil}/p54/led.c      |    0
 drivers/net/wireless/{ => intersil}/p54/lmac.h     |    0
 drivers/net/wireless/{ => intersil}/p54/main.c     |    0
 drivers/net/wireless/{ => intersil}/p54/p54.h      |    0
 drivers/net/wireless/{ => intersil}/p54/p54pci.c   |    0
 drivers/net/wireless/{ => intersil}/p54/p54pci.h   |    0
 drivers/net/wireless/{ => intersil}/p54/p54spi.c   |    0
 drivers/net/wireless/{ => intersil}/p54/p54spi.h   |    0
 .../wireless/{ => intersil}/p54/p54spi_eeprom.h    |    0
 drivers/net/wireless/{ => intersil}/p54/p54usb.c   |    0
 drivers/net/wireless/{ => intersil}/p54/p54usb.h   |    0
 drivers/net/wireless/{ => intersil}/p54/txrx.c     |    0
 22 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/net/wireless/{ => intersil}/p54/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/p54/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/p54/eeprom.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/eeprom.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/fwio.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/led.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/lmac.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/main.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54pci.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54spi.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54spi.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54spi_eeprom.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54usb.c (100%)
 rename drivers/net/wireless/{ => intersil}/p54/p54usb.h (100%)
 rename drivers/net/wireless/{ => intersil}/p54/txrx.c (100%)
MAINTAINERS +1 -1
index 63c601b04e68..818899a4c268 100644
@@ -7956,7 +7956,7 @@ M:	Christian Lamparter <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/p54
 S:	Maintained
-F:	drivers/net/wireless/p54/
+F:	drivers/net/wireless/intersil/p54/
 
 PA SEMI ETHERNET DRIVER
 M:	Olof Johansson <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index da10b00d8af1..bea2fbb4a238 100644
@@ -118,7 +118,6 @@ config MAC80211_HWSIM
 
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
-source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
drivers/net/wireless/Makefile +0 -2
index a60c5e55b55e..046963fc3958 100644
@@ -28,8 +28,6 @@ obj-$(CONFIG_RT2X00)	+= rt2x00/
 
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
 
-obj-$(CONFIG_P54_COMMON)	+= p54/
-
 obj-$(CONFIG_ATH_CARDS)		+= ath/
 
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
drivers/net/wireless/intersil/Kconfig +1 -0
index ec80b9117fd2..4bc3688bfa93 100644
@@ -12,5 +12,6 @@ config WLAN_VENDOR_INTERSIL
 if WLAN_VENDOR_INTERSIL
 
 source "drivers/net/wireless/intersil/hostap/Kconfig"
+source "drivers/net/wireless/intersil/p54/Kconfig"
 
 endif # WLAN_VENDOR_INTERSIL
drivers/net/wireless/intersil/Makefile +1 -0
index 4890ef79f280..90a72830b1ae 100644
@@ -1 +1,2 @@
 obj-$(CONFIG_HOSTAP)		+= hostap/
+obj-$(CONFIG_P54_COMMON)	+= p54/
drivers/net/wireless/intersil/p54/Kconfig renamed from drivers/net/wireless/p54/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/Kconfig
rename to drivers/net/wireless/intersil/p54/Kconfig
drivers/net/wireless/intersil/p54/Makefile renamed from drivers/net/wireless/p54/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/Makefile
rename to drivers/net/wireless/intersil/p54/Makefile
drivers/net/wireless/intersil/p54/eeprom.c renamed from drivers/net/wireless/p54/eeprom.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/eeprom.c
rename to drivers/net/wireless/intersil/p54/eeprom.c
drivers/net/wireless/intersil/p54/eeprom.h renamed from drivers/net/wireless/p54/eeprom.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/eeprom.h
rename to drivers/net/wireless/intersil/p54/eeprom.h
drivers/net/wireless/intersil/p54/fwio.c renamed from drivers/net/wireless/p54/fwio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/fwio.c
rename to drivers/net/wireless/intersil/p54/fwio.c
drivers/net/wireless/intersil/p54/led.c renamed from drivers/net/wireless/p54/led.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/led.c
rename to drivers/net/wireless/intersil/p54/led.c
drivers/net/wireless/intersil/p54/lmac.h renamed from drivers/net/wireless/p54/lmac.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/lmac.h
rename to drivers/net/wireless/intersil/p54/lmac.h
drivers/net/wireless/intersil/p54/main.c renamed from drivers/net/wireless/p54/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/main.c
rename to drivers/net/wireless/intersil/p54/main.c
drivers/net/wireless/intersil/p54/p54.h renamed from drivers/net/wireless/p54/p54.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54.h
rename to drivers/net/wireless/intersil/p54/p54.h
drivers/net/wireless/intersil/p54/p54pci.c renamed from drivers/net/wireless/p54/p54pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54pci.c
rename to drivers/net/wireless/intersil/p54/p54pci.c
drivers/net/wireless/intersil/p54/p54pci.h renamed from drivers/net/wireless/p54/p54pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54pci.h
rename to drivers/net/wireless/intersil/p54/p54pci.h
drivers/net/wireless/intersil/p54/p54spi.c renamed from drivers/net/wireless/p54/p54spi.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54spi.c
rename to drivers/net/wireless/intersil/p54/p54spi.c
drivers/net/wireless/intersil/p54/p54spi.h renamed from drivers/net/wireless/p54/p54spi.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54spi.h
rename to drivers/net/wireless/intersil/p54/p54spi.h
drivers/net/wireless/intersil/p54/p54spi_eeprom.h renamed from drivers/net/wireless/p54/p54spi_eeprom.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54spi_eeprom.h
rename to drivers/net/wireless/intersil/p54/p54spi_eeprom.h
drivers/net/wireless/intersil/p54/p54usb.c renamed from drivers/net/wireless/p54/p54usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54usb.c
rename to drivers/net/wireless/intersil/p54/p54usb.c
drivers/net/wireless/intersil/p54/p54usb.h renamed from drivers/net/wireless/p54/p54usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/p54usb.h
rename to drivers/net/wireless/intersil/p54/p54usb.h
drivers/net/wireless/intersil/p54/txrx.c renamed from drivers/net/wireless/p54/txrx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/p54/txrx.c
rename to drivers/net/wireless/intersil/p54/txrx.c
Signature · 1 line
1.7.9.5
author
#32 lore raw

PATCH v2 19/27 orinoco: move under intersil vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    1 -
 drivers/net/wireless/Makefile                      |    2 --
 drivers/net/wireless/intersil/Kconfig              |    1 +
 drivers/net/wireless/intersil/Makefile             |    1 +
 .../net/wireless/{ => intersil}/orinoco/Kconfig    |    0
 .../net/wireless/{ => intersil}/orinoco/Makefile   |    0
 .../net/wireless/{ => intersil}/orinoco/airport.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/cfg.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/cfg.h  |    0
 drivers/net/wireless/{ => intersil}/orinoco/fw.c   |    0
 drivers/net/wireless/{ => intersil}/orinoco/fw.h   |    0
 .../net/wireless/{ => intersil}/orinoco/hermes.c   |    0
 .../net/wireless/{ => intersil}/orinoco/hermes.h   |    0
 .../wireless/{ => intersil}/orinoco/hermes_dld.c   |    0
 .../wireless/{ => intersil}/orinoco/hermes_dld.h   |    0
 .../wireless/{ => intersil}/orinoco/hermes_rid.h   |    0
 drivers/net/wireless/{ => intersil}/orinoco/hw.c   |    0
 drivers/net/wireless/{ => intersil}/orinoco/hw.h   |    0
 drivers/net/wireless/{ => intersil}/orinoco/main.c |    0
 drivers/net/wireless/{ => intersil}/orinoco/main.h |    0
 drivers/net/wireless/{ => intersil}/orinoco/mic.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/mic.h  |    0
 .../net/wireless/{ => intersil}/orinoco/orinoco.h  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_cs.c   |    0
 .../{ => intersil}/orinoco/orinoco_nortel.c        |    0
 .../wireless/{ => intersil}/orinoco/orinoco_pci.c  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_pci.h  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_plx.c  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_tmd.c  |    0
 .../wireless/{ => intersil}/orinoco/orinoco_usb.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/scan.c |    0
 drivers/net/wireless/{ => intersil}/orinoco/scan.h |    0
 .../wireless/{ => intersil}/orinoco/spectrum_cs.c  |    0
 drivers/net/wireless/{ => intersil}/orinoco/wext.c |    0
 drivers/net/wireless/{ => intersil}/orinoco/wext.h |    0
 36 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/net/wireless/{ => intersil}/orinoco/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/airport.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/cfg.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/cfg.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/fw.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/fw.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_rid.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hw.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hw.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/main.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/main.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/mic.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/mic.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_nortel.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_plx.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_tmd.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_usb.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/scan.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/scan.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/spectrum_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/wext.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/wext.h (100%)
MAINTAINERS +1 -1
index 818899a4c268..53c15af0d967 100644
@@ -7930,7 +7930,7 @@ L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/orinoco
 W:	http://www.nongnu.org/orinoco/
 S:	Orphan
-F:	drivers/net/wireless/orinoco/
+F:	drivers/net/wireless/intersil/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:	Boaz Harrosh <[email protected]>
drivers/net/wireless/Kconfig +0 -1
index bea2fbb4a238..cc1f168603dc 100644
@@ -117,7 +117,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
drivers/net/wireless/Makefile +0 -2
index 046963fc3958..dd6d17cc4b7e 100644
@@ -12,8 +12,6 @@ obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
-obj-$(CONFIG_HERMES)		+= orinoco/
-
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 obj-$(CONFIG_WLAN)		+= realtek/
drivers/net/wireless/intersil/Kconfig +1 -0
index 4bc3688bfa93..2b056b6daef8 100644
@@ -12,6 +12,7 @@ config WLAN_VENDOR_INTERSIL
 if WLAN_VENDOR_INTERSIL
 
 source "drivers/net/wireless/intersil/hostap/Kconfig"
+source "drivers/net/wireless/intersil/orinoco/Kconfig"
 source "drivers/net/wireless/intersil/p54/Kconfig"
 
 endif # WLAN_VENDOR_INTERSIL
drivers/net/wireless/intersil/Makefile +1 -0
index 90a72830b1ae..aedb713da746 100644
@@ -1,2 +1,3 @@
 obj-$(CONFIG_HOSTAP)		+= hostap/
+obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_P54_COMMON)	+= p54/
drivers/net/wireless/intersil/orinoco/Kconfig renamed from drivers/net/wireless/orinoco/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/Kconfig
rename to drivers/net/wireless/intersil/orinoco/Kconfig
drivers/net/wireless/intersil/orinoco/Makefile renamed from drivers/net/wireless/orinoco/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/Makefile
rename to drivers/net/wireless/intersil/orinoco/Makefile
drivers/net/wireless/intersil/orinoco/airport.c renamed from drivers/net/wireless/orinoco/airport.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/airport.c
rename to drivers/net/wireless/intersil/orinoco/airport.c
drivers/net/wireless/intersil/orinoco/cfg.c renamed from drivers/net/wireless/orinoco/cfg.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/cfg.c
rename to drivers/net/wireless/intersil/orinoco/cfg.c
drivers/net/wireless/intersil/orinoco/cfg.h renamed from drivers/net/wireless/orinoco/cfg.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/cfg.h
rename to drivers/net/wireless/intersil/orinoco/cfg.h
drivers/net/wireless/intersil/orinoco/fw.c renamed from drivers/net/wireless/orinoco/fw.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/fw.c
rename to drivers/net/wireless/intersil/orinoco/fw.c
drivers/net/wireless/intersil/orinoco/fw.h renamed from drivers/net/wireless/orinoco/fw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/fw.h
rename to drivers/net/wireless/intersil/orinoco/fw.h
drivers/net/wireless/intersil/orinoco/hermes.c renamed from drivers/net/wireless/orinoco/hermes.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hermes.c
rename to drivers/net/wireless/intersil/orinoco/hermes.c
drivers/net/wireless/intersil/orinoco/hermes.h renamed from drivers/net/wireless/orinoco/hermes.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hermes.h
rename to drivers/net/wireless/intersil/orinoco/hermes.h
drivers/net/wireless/intersil/orinoco/hermes_dld.c renamed from drivers/net/wireless/orinoco/hermes_dld.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hermes_dld.c
rename to drivers/net/wireless/intersil/orinoco/hermes_dld.c
drivers/net/wireless/intersil/orinoco/hermes_dld.h renamed from drivers/net/wireless/orinoco/hermes_dld.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hermes_dld.h
rename to drivers/net/wireless/intersil/orinoco/hermes_dld.h
drivers/net/wireless/intersil/orinoco/hermes_rid.h renamed from drivers/net/wireless/orinoco/hermes_rid.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hermes_rid.h
rename to drivers/net/wireless/intersil/orinoco/hermes_rid.h
drivers/net/wireless/intersil/orinoco/hw.c renamed from drivers/net/wireless/orinoco/hw.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hw.c
rename to drivers/net/wireless/intersil/orinoco/hw.c
drivers/net/wireless/intersil/orinoco/hw.h renamed from drivers/net/wireless/orinoco/hw.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/hw.h
rename to drivers/net/wireless/intersil/orinoco/hw.h
drivers/net/wireless/intersil/orinoco/main.c renamed from drivers/net/wireless/orinoco/main.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/main.c
rename to drivers/net/wireless/intersil/orinoco/main.c
drivers/net/wireless/intersil/orinoco/main.h renamed from drivers/net/wireless/orinoco/main.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/main.h
rename to drivers/net/wireless/intersil/orinoco/main.h
drivers/net/wireless/intersil/orinoco/mic.c renamed from drivers/net/wireless/orinoco/mic.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/mic.c
rename to drivers/net/wireless/intersil/orinoco/mic.c
drivers/net/wireless/intersil/orinoco/mic.h renamed from drivers/net/wireless/orinoco/mic.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/mic.h
rename to drivers/net/wireless/intersil/orinoco/mic.h
drivers/net/wireless/intersil/orinoco/orinoco.h renamed from drivers/net/wireless/orinoco/orinoco.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco.h
rename to drivers/net/wireless/intersil/orinoco/orinoco.h
drivers/net/wireless/intersil/orinoco/orinoco_cs.c renamed from drivers/net/wireless/orinoco/orinoco_cs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_cs.c
rename to drivers/net/wireless/intersil/orinoco/orinoco_cs.c
drivers/net/wireless/intersil/orinoco/orinoco_nortel.c renamed from drivers/net/wireless/orinoco/orinoco_nortel.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_nortel.c
rename to drivers/net/wireless/intersil/orinoco/orinoco_nortel.c
drivers/net/wireless/intersil/orinoco/orinoco_pci.c renamed from drivers/net/wireless/orinoco/orinoco_pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_pci.c
rename to drivers/net/wireless/intersil/orinoco/orinoco_pci.c
drivers/net/wireless/intersil/orinoco/orinoco_pci.h renamed from drivers/net/wireless/orinoco/orinoco_pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_pci.h
rename to drivers/net/wireless/intersil/orinoco/orinoco_pci.h
drivers/net/wireless/intersil/orinoco/orinoco_plx.c renamed from drivers/net/wireless/orinoco/orinoco_plx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_plx.c
rename to drivers/net/wireless/intersil/orinoco/orinoco_plx.c
drivers/net/wireless/intersil/orinoco/orinoco_tmd.c renamed from drivers/net/wireless/orinoco/orinoco_tmd.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_tmd.c
rename to drivers/net/wireless/intersil/orinoco/orinoco_tmd.c
drivers/net/wireless/intersil/orinoco/orinoco_usb.c renamed from drivers/net/wireless/orinoco/orinoco_usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/orinoco_usb.c
rename to drivers/net/wireless/intersil/orinoco/orinoco_usb.c
drivers/net/wireless/intersil/orinoco/scan.c renamed from drivers/net/wireless/orinoco/scan.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/scan.c
rename to drivers/net/wireless/intersil/orinoco/scan.c
drivers/net/wireless/intersil/orinoco/scan.h renamed from drivers/net/wireless/orinoco/scan.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/scan.h
rename to drivers/net/wireless/intersil/orinoco/scan.h
drivers/net/wireless/intersil/orinoco/spectrum_cs.c renamed from drivers/net/wireless/orinoco/spectrum_cs.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/spectrum_cs.c
rename to drivers/net/wireless/intersil/orinoco/spectrum_cs.c
drivers/net/wireless/intersil/orinoco/wext.c renamed from drivers/net/wireless/orinoco/wext.c +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/wext.c
rename to drivers/net/wireless/intersil/orinoco/wext.c
drivers/net/wireless/intersil/orinoco/wext.h renamed from drivers/net/wireless/orinoco/wext.h +0 -0
similarity index 100%
rename from drivers/net/wireless/orinoco/wext.h
rename to drivers/net/wireless/intersil/orinoco/wext.h
Signature · 1 line
1.7.9.5
author
#33 lore raw

PATCH v2 20/27 prism54: move under intersil vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |   20 --------------------
 drivers/net/wireless/Makefile                      |    2 --
 drivers/net/wireless/intersil/Kconfig              |   20 ++++++++++++++++++++
 drivers/net/wireless/intersil/Makefile             |    1 +
 .../net/wireless/{ => intersil}/prism54/Makefile   |    0
 .../net/wireless/{ => intersil}/prism54/isl_38xx.c |    0
 .../net/wireless/{ => intersil}/prism54/isl_38xx.h |    0
 .../wireless/{ => intersil}/prism54/isl_ioctl.c    |    0
 .../wireless/{ => intersil}/prism54/isl_ioctl.h    |    0
 .../net/wireless/{ => intersil}/prism54/isl_oid.h  |    0
 .../wireless/{ => intersil}/prism54/islpci_dev.c   |    0
 .../wireless/{ => intersil}/prism54/islpci_dev.h   |    0
 .../wireless/{ => intersil}/prism54/islpci_eth.c   |    0
 .../wireless/{ => intersil}/prism54/islpci_eth.h   |    0
 .../{ => intersil}/prism54/islpci_hotplug.c        |    0
 .../wireless/{ => intersil}/prism54/islpci_mgt.c   |    0
 .../wireless/{ => intersil}/prism54/islpci_mgt.h   |    0
 .../net/wireless/{ => intersil}/prism54/oid_mgt.c  |    0
 .../net/wireless/{ => intersil}/prism54/oid_mgt.h  |    0
 .../wireless/{ => intersil}/prism54/prismcompat.h  |    0
 21 files changed, 22 insertions(+), 23 deletions(-)
 rename drivers/net/wireless/{ => intersil}/prism54/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_oid.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_hotplug.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/prismcompat.h (100%)
MAINTAINERS +1 -1
index 53c15af0d967..2c41981e4fdd 100644
@@ -8498,7 +8498,7 @@ M:	"Luis R. Rodriguez" <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/p54
 S:	Obsolete
-F:	drivers/net/wireless/prism54/
+F:	drivers/net/wireless/intersil/prism54/
 
 PS3 NETWORK SUPPORT
 M:	Geoff Levand <[email protected]>
drivers/net/wireless/Kconfig +0 -20
index cc1f168603dc..c92671f8b1c6 100644
@@ -52,26 +52,6 @@ config PCMCIA_WL3501
 	  It has basic support for Linux wireless extensions and initial
 	  micro support for ethtool.
 
-config PRISM54
-	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
-	depends on PCI
-	select WIRELESS_EXT
-	select WEXT_SPY
-	select WEXT_PRIV
-	select FW_LOADER
-	---help---
-	  This enables support for FullMAC PCI/Cardbus prism54 devices. This
-	  driver is now deprecated in favor for the SoftMAC driver, p54pci.
-	  p54pci supports FullMAC PCI/Cardbus devices as well.
-
-	  For more information refer to the p54 wiki:
-
-	  http://wireless.kernel.org/en/users/Drivers/p54
-
-	  Note: You need a motherboard with DMA support to use any of these cards
-
-	  When built as module you get the module prism54
-
 config USB_NET_RNDIS_WLAN
 	tristate "Wireless RNDIS USB support"
 	depends on USB
drivers/net/wireless/Makefile +0 -2
index dd6d17cc4b7e..679a1a0a048d 100644
@@ -12,8 +12,6 @@ obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
-obj-$(CONFIG_PRISM54)		+= prism54/
-
 obj-$(CONFIG_WLAN)		+= realtek/
 
 # 16-bit wireless PCMCIA client drivers
drivers/net/wireless/intersil/Kconfig +20 -0
index 2b056b6daef8..9da136049955 100644
@@ -15,4 +15,24 @@ source "drivers/net/wireless/intersil/hostap/Kconfig"
 source "drivers/net/wireless/intersil/orinoco/Kconfig"
 source "drivers/net/wireless/intersil/p54/Kconfig"
 
+config PRISM54
+	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'
+	depends on PCI
+	select WIRELESS_EXT
+	select WEXT_SPY
+	select WEXT_PRIV
+	select FW_LOADER
+	---help---
+	  This enables support for FullMAC PCI/Cardbus prism54 devices. This
+	  driver is now deprecated in favor for the SoftMAC driver, p54pci.
+	  p54pci supports FullMAC PCI/Cardbus devices as well.
+
+	  For more information refer to the p54 wiki:
+
+	  http://wireless.kernel.org/en/users/Drivers/p54
+
+	  Note: You need a motherboard with DMA support to use any of these cards
+
+	  When built as module you get the module prism54
+
 endif # WLAN_VENDOR_INTERSIL
drivers/net/wireless/intersil/Makefile +1 -0
index aedb713da746..9a8cbfee3ea5 100644
@@ -1,3 +1,4 @@
 obj-$(CONFIG_HOSTAP)		+= hostap/
 obj-$(CONFIG_HERMES)		+= orinoco/
 obj-$(CONFIG_P54_COMMON)	+= p54/
+obj-$(CONFIG_PRISM54)		+= prism54/
drivers/net/wireless/intersil/prism54/Makefile renamed from drivers/net/wireless/prism54/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/Makefile
rename to drivers/net/wireless/intersil/prism54/Makefile
drivers/net/wireless/intersil/prism54/isl_38xx.c renamed from drivers/net/wireless/prism54/isl_38xx.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/isl_38xx.c
rename to drivers/net/wireless/intersil/prism54/isl_38xx.c
drivers/net/wireless/intersil/prism54/isl_38xx.h renamed from drivers/net/wireless/prism54/isl_38xx.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/isl_38xx.h
rename to drivers/net/wireless/intersil/prism54/isl_38xx.h
drivers/net/wireless/intersil/prism54/isl_ioctl.c renamed from drivers/net/wireless/prism54/isl_ioctl.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/isl_ioctl.c
rename to drivers/net/wireless/intersil/prism54/isl_ioctl.c
drivers/net/wireless/intersil/prism54/isl_ioctl.h renamed from drivers/net/wireless/prism54/isl_ioctl.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/isl_ioctl.h
rename to drivers/net/wireless/intersil/prism54/isl_ioctl.h
drivers/net/wireless/intersil/prism54/isl_oid.h renamed from drivers/net/wireless/prism54/isl_oid.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/isl_oid.h
rename to drivers/net/wireless/intersil/prism54/isl_oid.h
drivers/net/wireless/intersil/prism54/islpci_dev.c renamed from drivers/net/wireless/prism54/islpci_dev.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_dev.c
rename to drivers/net/wireless/intersil/prism54/islpci_dev.c
drivers/net/wireless/intersil/prism54/islpci_dev.h renamed from drivers/net/wireless/prism54/islpci_dev.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_dev.h
rename to drivers/net/wireless/intersil/prism54/islpci_dev.h
drivers/net/wireless/intersil/prism54/islpci_eth.c renamed from drivers/net/wireless/prism54/islpci_eth.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_eth.c
rename to drivers/net/wireless/intersil/prism54/islpci_eth.c
drivers/net/wireless/intersil/prism54/islpci_eth.h renamed from drivers/net/wireless/prism54/islpci_eth.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_eth.h
rename to drivers/net/wireless/intersil/prism54/islpci_eth.h
drivers/net/wireless/intersil/prism54/islpci_hotplug.c renamed from drivers/net/wireless/prism54/islpci_hotplug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_hotplug.c
rename to drivers/net/wireless/intersil/prism54/islpci_hotplug.c
drivers/net/wireless/intersil/prism54/islpci_mgt.c renamed from drivers/net/wireless/prism54/islpci_mgt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_mgt.c
rename to drivers/net/wireless/intersil/prism54/islpci_mgt.c
drivers/net/wireless/intersil/prism54/islpci_mgt.h renamed from drivers/net/wireless/prism54/islpci_mgt.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/islpci_mgt.h
rename to drivers/net/wireless/intersil/prism54/islpci_mgt.h
drivers/net/wireless/intersil/prism54/oid_mgt.c renamed from drivers/net/wireless/prism54/oid_mgt.c +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/oid_mgt.c
rename to drivers/net/wireless/intersil/prism54/oid_mgt.c
drivers/net/wireless/intersil/prism54/oid_mgt.h renamed from drivers/net/wireless/prism54/oid_mgt.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/oid_mgt.h
rename to drivers/net/wireless/intersil/prism54/oid_mgt.h
drivers/net/wireless/intersil/prism54/prismcompat.h renamed from drivers/net/wireless/prism54/prismcompat.h +0 -0
similarity index 100%
rename from drivers/net/wireless/prism54/prismcompat.h
rename to drivers/net/wireless/intersil/prism54/prismcompat.h
Signature · 1 line
1.7.9.5
author
#34 lore raw

PATCH v2 21/27 realtek: create separate Kconfig file

In reply to Kalle Valo

Add new a Kconfig file and a vendor config for realtek. Also update MAINTAINERS which we missed to do when earlier moving rtlwifi.

---
 MAINTAINERS                          |    8 ++++----
 drivers/net/wireless/Kconfig         |    5 +----
 drivers/net/wireless/Makefile        |    3 +--
 drivers/net/wireless/realtek/Kconfig |   18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 drivers/net/wireless/realtek/Kconfig
MAINTAINERS +4 -4
index 2c41981e4fdd..a9f7f968f64e 100644
@@ -9035,7 +9035,7 @@ L:	[email protected]
 W:	http://wireless.kernel.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:	Orphan
-F:	drivers/net/wireless/rtl818x/rtl8180/
+F:	drivers/net/wireless/realtek/rtl818x/rtl8180/
 
 RTL8187 WIRELESS DRIVER
 M:	Herton Ronaldo Krzesinski <[email protected]>
@@ -9045,7 +9045,7 @@ L:	[email protected]
 W:	http://wireless.kernel.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:	Maintained
-F:	drivers/net/wireless/rtl818x/rtl8187/
+F:	drivers/net/wireless/realtek/rtl818x/rtl8187/
 
 RTL8192CE WIRELESS DRIVER
 M:	Larry Finger <[email protected]>
@@ -9054,8 +9054,8 @@ L:	[email protected]
 W:	http://wireless.kernel.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:	Maintained
-F:	drivers/net/wireless/rtlwifi/
-F:	drivers/net/wireless/rtlwifi/rtl8192ce/
+F:	drivers/net/wireless/realtek/rtlwifi/
+F:	drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
 
 RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 M:	Jes Sorensen <[email protected]>
drivers/net/wireless/Kconfig +1 -4
index c92671f8b1c6..28af8b10a66e 100644
@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
+source "drivers/net/wireless/realtek/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
 
@@ -81,8 +82,6 @@ config USB_NET_RNDIS_WLAN
 
 	  If you choose to build a module, it'll be called rndis_wlan.
 
-source "drivers/net/wireless/realtek/rtl818x/Kconfig"
-
 config MAC80211_HWSIM
 	tristate "Simulated radio testing tool for mac80211"
 	depends on MAC80211
@@ -99,8 +98,6 @@ config MAC80211_HWSIM
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
-source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
-source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 
drivers/net/wireless/Makefile +1 -2
index 679a1a0a048d..12f6c59668a5 100644
@@ -9,11 +9,10 @@ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
+obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
-obj-$(CONFIG_WLAN)		+= realtek/
-
 # 16-bit wireless PCMCIA client drivers
 obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
 obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
drivers/net/wireless/realtek/Kconfig new file +18 -0
new file mode 100644
index 000000000000..8a8ba2003964
@@ -0,0 +1,18 @@
+config WLAN_VENDOR_REALTEK
+	bool "Realtek devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_REALTEK
+
+source "drivers/net/wireless/realtek/rtl818x/Kconfig"
+source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
+source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
+
+endif # WLAN_VENDOR_REALTEK
Signature · 1 line
1.7.9.5
Acked-by on v2 21/27
#35 lore raw

Re: [PATCH v2 21/27] realtek: create separate Kconfig file

Quoted 5 lines · Kalle Valo

Add new a Kconfig file and a vendor config for realtek. Also update MAINTAINERS which we missed to do when earlier moving rtlwifi.

---

Thanks,

Larry

Quoted 102 lines
  MAINTAINERS                          |    8 ++++----
  drivers/net/wireless/Kconfig         |    5 +----
  drivers/net/wireless/Makefile        |    3 +--
  drivers/net/wireless/realtek/Kconfig |   18 ++++++++++++++++++
  4 files changed, 24 insertions(+), 10 deletions(-)

create mode 100644 drivers/net/wireless/realtek/Kconfig

MAINTAINERS +4 -4
index 2c41981e4fdd..a9f7f968f64e 100644
@@ -9035,7 +9035,7 @@ L:	[email protected]
  W:	http://wireless.kernel.org/
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:	Orphan
-F:	drivers/net/wireless/rtl818x/rtl8180/
+F:	drivers/net/wireless/realtek/rtl818x/rtl8180/
 
  RTL8187 WIRELESS DRIVER
  M:	Herton Ronaldo Krzesinski <[email protected]>
@@ -9045,7 +9045,7 @@ L:	[email protected]
  W:	http://wireless.kernel.org/
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:	Maintained
-F:	drivers/net/wireless/rtl818x/rtl8187/
+F:	drivers/net/wireless/realtek/rtl818x/rtl8187/
 
  RTL8192CE WIRELESS DRIVER
  M:	Larry Finger <[email protected]>
@@ -9054,8 +9054,8 @@ L:	[email protected]
  W:	http://wireless.kernel.org/
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:	Maintained
-F:	drivers/net/wireless/rtlwifi/
-F:	drivers/net/wireless/rtlwifi/rtl8192ce/
+F:	drivers/net/wireless/realtek/rtlwifi/
+F:	drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
 
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:	Jes Sorensen <[email protected]>
drivers/net/wireless/Kconfig +1 -4
index c92671f8b1c6..28af8b10a66e 100644
@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig"
  source "drivers/net/wireless/intel/Kconfig"
  source "drivers/net/wireless/intersil/Kconfig"
  source "drivers/net/wireless/marvell/Kconfig"
+source "drivers/net/wireless/realtek/Kconfig"
  source "drivers/net/wireless/st/Kconfig"
  source "drivers/net/wireless/zydas/Kconfig"
 
@@ -81,8 +82,6 @@ config USB_NET_RNDIS_WLAN
 
  	  If you choose to build a module, it'll be called rndis_wlan.
 
-source "drivers/net/wireless/realtek/rtl818x/Kconfig"
-
  config MAC80211_HWSIM
  	tristate "Simulated radio testing tool for mac80211"
  	depends on MAC80211
@@ -99,8 +98,6 @@ config MAC80211_HWSIM
  source "drivers/net/wireless/ath/Kconfig"
  source "drivers/net/wireless/rt2x00/Kconfig"
  source "drivers/net/wireless/mediatek/Kconfig"
-source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
-source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
  source "drivers/net/wireless/ti/Kconfig"
  source "drivers/net/wireless/rsi/Kconfig"
 
drivers/net/wireless/Makefile +1 -2
index 679a1a0a048d..12f6c59668a5 100644
@@ -9,11 +9,10 @@ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
  obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
  obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
  obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
+obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
  obj-$(CONFIG_WLAN_VENDOR_ST) += st/
  obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
-obj-$(CONFIG_WLAN)		+= realtek/
-
  # 16-bit wireless PCMCIA client drivers
  obj-$(CONFIG_PCMCIA_RAYCS)	+= ray_cs.o
  obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
drivers/net/wireless/realtek/Kconfig new file +8 -0
new file mode 100644
index 000000000000..8a8ba2003964
@@ -0,0 +1,18 @@
+config WLAN_VENDOR_REALTEK
+	bool "Realtek devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all

drivers/net/wireless/realtek/Kconfig line 18

Quoted 10 lines
drivers/net/wireless/realtek/Kconfig new file +10 -0
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_REALTEK
+
+source "drivers/net/wireless/realtek/rtl818x/Kconfig"
+source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
+source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
+
+endif # WLAN_VENDOR_REALTEK

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#36 lore raw

PATCH v2 22/27 rsi: add vendor Kconfig entry

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 drivers/net/wireless/Kconfig     |    2 +-
 drivers/net/wireless/Makefile    |    3 +--
 drivers/net/wireless/rsi/Kconfig |   15 +++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/net/wireless/Kconfig +1 -1
index 28af8b10a66e..518608403bd3 100644
@@ -25,6 +25,7 @@ source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/realtek/Kconfig"
+source "drivers/net/wireless/rsi/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
 
@@ -99,6 +100,5 @@ source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
-source "drivers/net/wireless/rsi/Kconfig"
 
 endif # WLAN
drivers/net/wireless/Makefile +1 -2
index 12f6c59668a5..d38b6cc338df 100644
@@ -10,6 +10,7 @@ obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
@@ -28,5 +29,3 @@ obj-$(CONFIG_ATH_CARDS)		+= ath/
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
 
 obj-$(CONFIG_WL_TI)	+= ti/
-
-obj-$(CONFIG_RSI_91X)	+= rsi/
drivers/net/wireless/rsi/Kconfig +15 -0
index 35245f994c10..7c5e4ca4e3d0 100644
@@ -1,3 +1,16 @@
+config WLAN_VENDOR_RSI
+	bool "Redpine Signals Inc devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_RSI
+
 config RSI_91X
 	tristate "Redpine Signals Inc 91x WLAN driver support"
 	depends on MAC80211
@@ -28,3 +41,5 @@ config RSI_USB
 	---help---
 	  This option enables the USB bus support in rsi drivers.
 	  Select M (recommended), if you have a RSI 1x1 wireless module.
+
+endif # WLAN_VENDOR_RSI
Signature · 1 line
1.7.9.5
author
#37 lore raw

PATCH v2 23/27 rt2x00: move under ralink vendor directory

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 MAINTAINERS                                        |    2 +-
 drivers/net/wireless/Kconfig                       |    2 +-
 drivers/net/wireless/Makefile                      |    3 +--
 drivers/net/wireless/ralink/Kconfig                |   16 ++++++++++++++++
 drivers/net/wireless/ralink/Makefile               |    1 +
 drivers/net/wireless/{ => ralink}/rt2x00/Kconfig   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/Makefile  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2400pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2400pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500usb.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2500usb.h   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800soc.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800usb.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2800usb.h   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h  |    0
 .../wireless/{ => ralink}/rt2x00/rt2x00config.c    |    0
 .../wireless/{ => ralink}/rt2x00/rt2x00crypto.c    |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.c |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.h |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00dev.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00dump.h  |    0
 .../wireless/{ => ralink}/rt2x00/rt2x00firmware.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00lib.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00link.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mac.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h  |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.c |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.h |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00reg.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.h   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.c   |    0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.h   |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c |    0
 drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h |    0
 51 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 drivers/net/wireless/ralink/Kconfig
 create mode 100644 drivers/net/wireless/ralink/Makefile
 rename drivers/net/wireless/{ => ralink}/rt2x00/Kconfig (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/Makefile (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800soc.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00config.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00crypto.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dev.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dump.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00firmware.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00lib.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00link.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mac.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00reg.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h (100%)
MAINTAINERS +1 -1
index a9f7f968f64e..38c049d07966 100644
@@ -8801,7 +8801,7 @@ M:	Stanislaw Gruszka <[email protected]>
 M:	Helmut Schaa <[email protected]>
 L:	[email protected]
 S:	Maintained
-F:	drivers/net/wireless/rt2x00/
+F:	drivers/net/wireless/ralink/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
 M:	Jens Axboe <[email protected]>
drivers/net/wireless/Kconfig +1 -1
index 518608403bd3..c58e244b5079 100644
@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
+source "drivers/net/wireless/ralink/Kconfig"
 source "drivers/net/wireless/realtek/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
@@ -97,7 +98,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 
drivers/net/wireless/Makefile +1 -2
index d38b6cc338df..8ac72fd44d17 100644
@@ -9,6 +9,7 @@ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
+obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
 obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
@@ -20,8 +21,6 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
-obj-$(CONFIG_RT2X00)	+= rt2x00/
-
 obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
 
 obj-$(CONFIG_ATH_CARDS)		+= ath/
drivers/net/wireless/ralink/Kconfig new file +16 -0
new file mode 100644
index 000000000000..41dbf3130e2b
@@ -0,0 +1,16 @@
+config WLAN_VENDOR_RALINK
+	bool "Ralink devices"
+	default y
+	---help---
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if WLAN_VENDOR_RALINK
+
+source "drivers/net/wireless/ralink/rt2x00/Kconfig"
+
+endif # WLAN_VENDOR_RALINK
drivers/net/wireless/ralink/Makefile new file +1 -0
new file mode 100644
index 000000000000..f84c0a2e4f4d
@@ -0,0 +1 @@
+obj-$(CONFIG_RT2X00)	+= rt2x00/
drivers/net/wireless/ralink/rt2x00/Kconfig renamed from drivers/net/wireless/rt2x00/Kconfig +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/Kconfig
rename to drivers/net/wireless/ralink/rt2x00/Kconfig
drivers/net/wireless/ralink/rt2x00/Makefile renamed from drivers/net/wireless/rt2x00/Makefile +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/Makefile
rename to drivers/net/wireless/ralink/rt2x00/Makefile
drivers/net/wireless/ralink/rt2x00/rt2400pci.c renamed from drivers/net/wireless/rt2x00/rt2400pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2400pci.c
rename to drivers/net/wireless/ralink/rt2x00/rt2400pci.c
drivers/net/wireless/ralink/rt2x00/rt2400pci.h renamed from drivers/net/wireless/rt2x00/rt2400pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2400pci.h
rename to drivers/net/wireless/ralink/rt2x00/rt2400pci.h
drivers/net/wireless/ralink/rt2x00/rt2500pci.c renamed from drivers/net/wireless/rt2x00/rt2500pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2500pci.c
rename to drivers/net/wireless/ralink/rt2x00/rt2500pci.c
drivers/net/wireless/ralink/rt2x00/rt2500pci.h renamed from drivers/net/wireless/rt2x00/rt2500pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2500pci.h
rename to drivers/net/wireless/ralink/rt2x00/rt2500pci.h
drivers/net/wireless/ralink/rt2x00/rt2500usb.c renamed from drivers/net/wireless/rt2x00/rt2500usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2500usb.c
rename to drivers/net/wireless/ralink/rt2x00/rt2500usb.c
drivers/net/wireless/ralink/rt2x00/rt2500usb.h renamed from drivers/net/wireless/rt2x00/rt2500usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2500usb.h
rename to drivers/net/wireless/ralink/rt2x00/rt2500usb.h
drivers/net/wireless/ralink/rt2x00/rt2800.h renamed from drivers/net/wireless/rt2x00/rt2800.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800.h
rename to drivers/net/wireless/ralink/rt2x00/rt2800.h
drivers/net/wireless/ralink/rt2x00/rt2800lib.c renamed from drivers/net/wireless/rt2x00/rt2800lib.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800lib.c
rename to drivers/net/wireless/ralink/rt2x00/rt2800lib.c
drivers/net/wireless/ralink/rt2x00/rt2800lib.h renamed from drivers/net/wireless/rt2x00/rt2800lib.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800lib.h
rename to drivers/net/wireless/ralink/rt2x00/rt2800lib.h
drivers/net/wireless/ralink/rt2x00/rt2800mmio.c renamed from drivers/net/wireless/rt2x00/rt2800mmio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800mmio.c
rename to drivers/net/wireless/ralink/rt2x00/rt2800mmio.c
drivers/net/wireless/ralink/rt2x00/rt2800mmio.h renamed from drivers/net/wireless/rt2x00/rt2800mmio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800mmio.h
rename to drivers/net/wireless/ralink/rt2x00/rt2800mmio.h
drivers/net/wireless/ralink/rt2x00/rt2800pci.c renamed from drivers/net/wireless/rt2x00/rt2800pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800pci.c
rename to drivers/net/wireless/ralink/rt2x00/rt2800pci.c
drivers/net/wireless/ralink/rt2x00/rt2800pci.h renamed from drivers/net/wireless/rt2x00/rt2800pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800pci.h
rename to drivers/net/wireless/ralink/rt2x00/rt2800pci.h
drivers/net/wireless/ralink/rt2x00/rt2800soc.c renamed from drivers/net/wireless/rt2x00/rt2800soc.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800soc.c
rename to drivers/net/wireless/ralink/rt2x00/rt2800soc.c
drivers/net/wireless/ralink/rt2x00/rt2800usb.c renamed from drivers/net/wireless/rt2x00/rt2800usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800usb.c
rename to drivers/net/wireless/ralink/rt2x00/rt2800usb.c
drivers/net/wireless/ralink/rt2x00/rt2800usb.h renamed from drivers/net/wireless/rt2x00/rt2800usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2800usb.h
rename to drivers/net/wireless/ralink/rt2x00/rt2800usb.h
drivers/net/wireless/ralink/rt2x00/rt2x00.h renamed from drivers/net/wireless/rt2x00/rt2x00.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00.h
drivers/net/wireless/ralink/rt2x00/rt2x00config.c renamed from drivers/net/wireless/rt2x00/rt2x00config.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00config.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00config.c
drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c renamed from drivers/net/wireless/rt2x00/rt2x00crypto.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00crypto.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c
drivers/net/wireless/ralink/rt2x00/rt2x00debug.c renamed from drivers/net/wireless/rt2x00/rt2x00debug.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00debug.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
drivers/net/wireless/ralink/rt2x00/rt2x00debug.h renamed from drivers/net/wireless/rt2x00/rt2x00debug.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00debug.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00debug.h
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c renamed from drivers/net/wireless/rt2x00/rt2x00dev.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00dev.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
drivers/net/wireless/ralink/rt2x00/rt2x00dump.h renamed from drivers/net/wireless/rt2x00/rt2x00dump.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00dump.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00dump.h
drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c renamed from drivers/net/wireless/rt2x00/rt2x00firmware.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00firmware.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c
drivers/net/wireless/ralink/rt2x00/rt2x00leds.c renamed from drivers/net/wireless/rt2x00/rt2x00leds.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00leds.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
drivers/net/wireless/ralink/rt2x00/rt2x00leds.h renamed from drivers/net/wireless/rt2x00/rt2x00leds.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00leds.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00leds.h
drivers/net/wireless/ralink/rt2x00/rt2x00lib.h renamed from drivers/net/wireless/rt2x00/rt2x00lib.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00lib.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00lib.h
drivers/net/wireless/ralink/rt2x00/rt2x00link.c renamed from drivers/net/wireless/rt2x00/rt2x00link.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00link.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00link.c
drivers/net/wireless/ralink/rt2x00/rt2x00mac.c renamed from drivers/net/wireless/rt2x00/rt2x00mac.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00mac.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c renamed from drivers/net/wireless/rt2x00/rt2x00mmio.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00mmio.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c
drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h renamed from drivers/net/wireless/rt2x00/rt2x00mmio.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00mmio.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h
drivers/net/wireless/ralink/rt2x00/rt2x00pci.c renamed from drivers/net/wireless/rt2x00/rt2x00pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00pci.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
drivers/net/wireless/ralink/rt2x00/rt2x00pci.h renamed from drivers/net/wireless/rt2x00/rt2x00pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00pci.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00pci.h
drivers/net/wireless/ralink/rt2x00/rt2x00queue.c renamed from drivers/net/wireless/rt2x00/rt2x00queue.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00queue.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
drivers/net/wireless/ralink/rt2x00/rt2x00queue.h renamed from drivers/net/wireless/rt2x00/rt2x00queue.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00queue.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
drivers/net/wireless/ralink/rt2x00/rt2x00reg.h renamed from drivers/net/wireless/rt2x00/rt2x00reg.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00reg.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00reg.h
drivers/net/wireless/ralink/rt2x00/rt2x00soc.c renamed from drivers/net/wireless/rt2x00/rt2x00soc.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00soc.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00soc.c
drivers/net/wireless/ralink/rt2x00/rt2x00soc.h renamed from drivers/net/wireless/rt2x00/rt2x00soc.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00soc.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00soc.h
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c renamed from drivers/net/wireless/rt2x00/rt2x00usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00usb.c
rename to drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
drivers/net/wireless/ralink/rt2x00/rt2x00usb.h renamed from drivers/net/wireless/rt2x00/rt2x00usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt2x00usb.h
rename to drivers/net/wireless/ralink/rt2x00/rt2x00usb.h
drivers/net/wireless/ralink/rt2x00/rt61pci.c renamed from drivers/net/wireless/rt2x00/rt61pci.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt61pci.c
rename to drivers/net/wireless/ralink/rt2x00/rt61pci.c
drivers/net/wireless/ralink/rt2x00/rt61pci.h renamed from drivers/net/wireless/rt2x00/rt61pci.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt61pci.h
rename to drivers/net/wireless/ralink/rt2x00/rt61pci.h
drivers/net/wireless/ralink/rt2x00/rt73usb.c renamed from drivers/net/wireless/rt2x00/rt73usb.c +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt73usb.c
rename to drivers/net/wireless/ralink/rt2x00/rt73usb.c
drivers/net/wireless/ralink/rt2x00/rt73usb.h renamed from drivers/net/wireless/rt2x00/rt73usb.h +0 -0
similarity index 100%
rename from drivers/net/wireless/rt2x00/rt73usb.h
rename to drivers/net/wireless/ralink/rt2x00/rt73usb.h
Signature · 1 line
1.7.9.5
#38 lore raw

Re: [PATCH v2 23/27] rt2x00: move under ralink vendor directory

Quoted 3 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

For Ralink you could probably drop the rt2x00 directory. RaLink Tech. doesn't exist any more and rt2x00 contains drivers for all of their devices.

Obviously this is just a suggestion, not a show stopper.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#39 lore raw

Re: [PATCH v2 23/27] rt2x00: move under ralink vendor directory

Quoted 10 lines · Jakub Kicinski
Quoted 3 lines · Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

For Ralink you could probably drop the rt2x00 directory. RaLink Tech. doesn't exist any more and rt2x00 contains drivers for all of their devices.

Obviously this is just a suggestion, not a show stopper.

Like I said with a similar comment to brcm80211 I would like to do that separately. This is 27 patches already and I don't want make these any more complicated than necessary.

Signature · 1 line
Kalle Valo
author
#40 lore raw

PATCH v2 24/27 mediatek: unify Kconfig with other vendors

In reply to Kalle Valo

Part of reorganising wireless drivers directory and Kconfig.

---
 drivers/net/wireless/Kconfig          |    2 +-
 drivers/net/wireless/Makefile         |    3 +--
 drivers/net/wireless/mediatek/Kconfig |   16 ++++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)
drivers/net/wireless/Kconfig +1 -1
index c58e244b5079..2225e06611fa 100644
@@ -24,6 +24,7 @@ source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
+source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/ralink/Kconfig"
 source "drivers/net/wireless/realtek/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
@@ -98,7 +99,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/mediatek/Kconfig"
 source "drivers/net/wireless/ti/Kconfig"
 
 endif # WLAN
drivers/net/wireless/Makefile +1 -2
index 8ac72fd44d17..0fa909072846 100644
@@ -9,6 +9,7 @@ obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
+obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/
 obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
 obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
@@ -21,8 +22,6 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
-obj-$(CONFIG_WL_MEDIATEK)	+= mediatek/
-
 obj-$(CONFIG_ATH_CARDS)		+= ath/
 
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
drivers/net/wireless/mediatek/Kconfig +10 -6
index cba300c6b5da..28843fed750a 100644
@@ -1,10 +1,14 @@
-menuconfig WL_MEDIATEK
-	bool "Mediatek Wireless LAN support"
+config WLAN_VENDOR_MEDIATEK
+	bool "MediaTek devices"
+	default y
 	---help---
-	  Enable community drivers for MediaTek WiFi devices.
-	  Those drivers make use of the Linux mac80211 stack.
+	  If you have a wireless card belonging to this class, say Y.
 
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
 
-if WL_MEDIATEK
+if WLAN_VENDOR_MEDIATEK
 source "drivers/net/wireless/mediatek/mt7601u/Kconfig"
-endif # WL_MEDIATEK
+endif # WLAN_VENDOR_MEDIATEK
Signature · 1 line
1.7.9.5
author
#41 lore raw

PATCH v2 25/27 ti: unify Kconfig with other vendors

In reply to Kalle Valo

Rename WL_TI to WLAN_VENDOR_TI to match with other vendor configs and make sure that it's enabled by default in new configs. Convert menuconfigs to regular configs to unify the wireless drivers menuconfig. Part of reorganising wireless drivers directory and Kconfig.

Also remove WLCORE dependency to WL_TI. It should not be needed as WLCORE is already under if WLAN_VENDOR_TI.

---
 drivers/net/wireless/Kconfig           |    2 +-
 drivers/net/wireless/Makefile          |    3 +--
 drivers/net/wireless/ti/Kconfig        |   18 +++++++++++-------
 drivers/net/wireless/ti/wl1251/Kconfig |    2 +-
 drivers/net/wireless/ti/wlcore/Kconfig |    2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)
drivers/net/wireless/Kconfig +1 -1
index 2225e06611fa..cb115db309ce 100644
@@ -29,6 +29,7 @@ source "drivers/net/wireless/ralink/Kconfig"
 source "drivers/net/wireless/realtek/Kconfig"
 source "drivers/net/wireless/rsi/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
+source "drivers/net/wireless/ti/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
 
 config PCMCIA_RAYCS
@@ -99,6 +100,5 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/ti/Kconfig"
 
 endif # WLAN
drivers/net/wireless/Makefile +1 -2
index 0fa909072846..8c99b9faab09 100644
@@ -14,6 +14,7 @@ obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
 obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
 obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
+obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 
 # 16-bit wireless PCMCIA client drivers
@@ -25,5 +26,3 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 obj-$(CONFIG_ATH_CARDS)		+= ath/
 
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
-
-obj-$(CONFIG_WL_TI)	+= ti/
drivers/net/wireless/ti/Kconfig +11 -7
index cbe1e7fef61b..92fbd6597e34 100644
@@ -1,11 +1,15 @@
-menuconfig WL_TI
-	bool "TI Wireless LAN support"
+config WLAN_VENDOR_TI
+	bool "Texas Instrument devices"
+	default y
 	---help---
-	  This section contains support for all the wireless drivers
-	  for Texas Instruments WLAN chips, such as wl1251 and the wl12xx
-	  family.
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
 
-if WL_TI
+if WLAN_VENDOR_TI
 source "drivers/net/wireless/ti/wl1251/Kconfig"
 source "drivers/net/wireless/ti/wl12xx/Kconfig"
 source "drivers/net/wireless/ti/wl18xx/Kconfig"
@@ -21,4 +25,4 @@ config WILINK_PLATFORM_DATA
 	Small platform data bit needed to pass data to the sdio modules.
 
 
-endif # WL_TI
+endif # WLAN_VENDOR_TI
drivers/net/wireless/ti/wl1251/Kconfig +1 -1
index 477a206c098e..7142ccf3a425 100644
@@ -1,4 +1,4 @@
-menuconfig WL1251
+config WL1251
 	tristate "TI wl1251 driver support"
 	depends on MAC80211
 	select FW_LOADER
drivers/net/wireless/ti/wlcore/Kconfig +1 -1
index 7c099542b214..969c9d79bfc8 100644
@@ -1,6 +1,6 @@
 config WLCORE
 	tristate "TI wlcore support"
-	depends on WL_TI && MAC80211
+	depends on MAC80211
 	select FW_LOADER
 	---help---
 	  This module contains the main code for TI WLAN chips.  It abstracts
Signature · 1 line
1.7.9.5
author
#42 lore raw

PATCH v2 26/27 ath: unify Kconfig with other vendors

In reply to Kalle Valo

Change menuconfig to config to keep the Kconfig entries unified. Part of reorganising wireless drivers directory and Kconfig.

---
 drivers/net/wireless/Kconfig     |    3 +--
 drivers/net/wireless/Makefile    |    3 +--
 drivers/net/wireless/ath/Kconfig |   17 ++++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)
drivers/net/wireless/Kconfig +1 -2
index cb115db309ce..3af6d0b9ca21 100644
@@ -18,6 +18,7 @@ menuconfig WLAN
 if WLAN
 
 source "drivers/net/wireless/admtek/Kconfig"
+source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
@@ -99,6 +100,4 @@ config MAC80211_HWSIM
 	  To compile this driver as a module, choose M here: the module will be
 	  called mac80211_hwsim.  If unsure, say N.
 
-source "drivers/net/wireless/ath/Kconfig"
-
 endif # WLAN
drivers/net/wireless/Makefile +1 -2
index 8c99b9faab09..f00d42953fb8 100644
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
+obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/
 obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
@@ -23,6 +24,4 @@ obj-$(CONFIG_PCMCIA_WL3501)	+= wl3501_cs.o
 
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)	+= rndis_wlan.o
 
-obj-$(CONFIG_ATH_CARDS)		+= ath/
-
 obj-$(CONFIG_MAC80211_HWSIM)	+= mac80211_hwsim.o
drivers/net/wireless/ath/Kconfig +10 -7
index ce7826009eeb..44b2470af81d 100644
@@ -1,13 +1,16 @@
 config ATH_COMMON
 	tristate
 
-menuconfig ATH_CARDS
-	tristate "Atheros Wireless Cards"
-	depends on CFG80211 && (!UML || BROKEN)
+config WLAN_VENDOR_ATH
+	bool "Atheros/Qualcomm devices"
+	default y
 	---help---
-	  This will enable the support for the Atheros wireless drivers.
-	  ath5k, ath9k, ath9k_htc and ar9170 drivers share some common code, this option
-	  enables the common ath.ko module which shares common helpers.
+	  If you have a wireless card belonging to this class, say Y.
+
+	  Note that the answer to this question doesn't directly affect the
+	  kernel: saying N will just cause the configurator to skip all
+	  the questions about  cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
 
 	  For more information and documentation on this module you can visit:
 
@@ -17,7 +20,7 @@ menuconfig ATH_CARDS
 
 	  http://wireless.kernel.org/en/users/Drivers/Atheros
 
-if ATH_CARDS
+if WLAN_VENDOR_ATH
 
 config ATH_DEBUG
 	bool "Atheros wireless debugging"
Signature · 1 line
1.7.9.5
author
#43 lore raw

PATCH v2 27/27 mac80211_hwsim: move Kconfig entry for sorting alphabetically

In reply to Kalle Valo

mac80211_hwsim was not placed alphabetically correctly in menuconfig, fix that.

---
 drivers/net/wireless/Kconfig |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/net/wireless/Kconfig +13 -12
index 3af6d0b9ca21..8c8edaf1bba6 100644
@@ -58,6 +58,19 @@ config PCMCIA_WL3501
 	  It has basic support for Linux wireless extensions and initial
 	  micro support for ethtool.
 
+config MAC80211_HWSIM
+	tristate "Simulated radio testing tool for mac80211"
+	depends on MAC80211
+	---help---
+	  This driver is a developer testing tool that can be used to test
+	  IEEE 802.11 networking stack (mac80211) functionality. This is not
+	  needed for normal wireless LAN usage and is only for testing. See
+	  Documentation/networking/mac80211_hwsim for more information on how
+	  to use this tool.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called mac80211_hwsim.  If unsure, say N.
+
 config USB_NET_RNDIS_WLAN
 	tristate "Wireless RNDIS USB support"
 	depends on USB
@@ -87,17 +100,4 @@ config USB_NET_RNDIS_WLAN
 
 	  If you choose to build a module, it'll be called rndis_wlan.
 
-config MAC80211_HWSIM
-	tristate "Simulated radio testing tool for mac80211"
-	depends on MAC80211
-	---help---
-	  This driver is a developer testing tool that can be used to test
-	  IEEE 802.11 networking stack (mac80211) functionality. This is not
-	  needed for normal wireless LAN usage and is only for testing. See
-	  Documentation/networking/mac80211_hwsim for more information on how
-	  to use this tool.
-
-	  To compile this driver as a module, choose M here: the module will be
-	  called mac80211_hwsim.  If unsure, say N.
author Applied
#44 lore raw
In reply to Kalle Valo
Quoted 23 lines · Kalle Valo

Hi,

I started to reorganise drivers/net/wireless directory and follow what drivers/net/ethernet has. The major change is that new vendor directories are created and most of the drivers are now under those vendor directories:

admtek/
ath/
atmel/
broadcom/
cisco/
intel/
intersil/
marvell/
mediatek/
ralink/
realtek/
rsi/
st/
ti/
zydas/

[...]

Quoted 20 lines

Kalle Valo (27):
adm80211: move under admtek vendor directory
airo: move under cisco vendor directory
atmel: move under atmel vendor directory
b43: move under broadcom vendor directory
b43legacy: move under broadcom vendor directory
brcm80211: move under broadcom vendor directory
cw1200: move under st vendor directory
ipw2x00: move under intel vendor directory
iwlegacy: move under intel directory
iwlwifi: move under intel vendor directory
libertas: move under marvell vendor directory
libertas_tf: move under marvell vendor directory
mwifiex: move under marvell vendor directory
mwl8k: move under marvell vendor directory
zd1201: move under zydas vendor directory
zd1211rw: move under zydas vendor directory
hostap: move under intersil vendor directory
p54: move under intersil vendor directory
orinoco: move under intersil vendor directory

Quoted 8 lines

prism54: move under intersil vendor directory
realtek: create separate Kconfig file
rsi: add vendor Kconfig entry
rt2x00: move under ralink vendor directory
mediatek: unify Kconfig with other vendors
ti: unify Kconfig with other vendors
ath: unify Kconfig with other vendors
mac80211_hwsim: move Kconfig entry for sorting alphabetically

Applied to wireless-drivers-next.git.

Signature · 5 lines
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html