From d4a173040a1023e9e0443ea572f4685df406cde9 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 19:49:19 +0200 Subject: [PATCH 01/27] adm80211: move under admtek vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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%) diff --git a/MAINTAINERS b/MAINTAINERS index 35fe7ae0492e..f1adb66094f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -388,7 +388,7 @@ ADM8211 WIRELESS DRIVER L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index f9f94229bf1b..7d8f47117c4d 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 740fdd353c5d..be215f43ec1d 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/admtek/Kconfig b/drivers/net/wireless/admtek/Kconfig new file mode 100644 index 000000000000..d5a2dc728078 --- /dev/null +++ b/drivers/net/wireless/admtek/Kconfig @@ -0,0 +1,41 @@ +config WLAN_VENDOR_ADMTEK + bool "ADMtek 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_ADMTEK + +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. + +endif # WLAN_VENDOR_ADMTEK diff --git a/drivers/net/wireless/admtek/Makefile b/drivers/net/wireless/admtek/Makefile new file mode 100644 index 000000000000..9cca7e571cdd --- /dev/null +++ b/drivers/net/wireless/admtek/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ADM8211) += adm8211.o diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/admtek/adm8211.c similarity index 100% rename from drivers/net/wireless/adm8211.c rename to drivers/net/wireless/admtek/adm8211.c diff --git a/drivers/net/wireless/adm8211.h b/drivers/net/wireless/admtek/adm8211.h similarity index 100% rename from drivers/net/wireless/adm8211.h rename to drivers/net/wireless/admtek/adm8211.h From 30db0ca8bc78e9ba98c6c71edcd46ff6dd21cbf6 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 19:49:19 +0200 Subject: [PATCH 02/27] airo: move under cisco vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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%) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 7d8f47117c4d..ce5211ba1b29 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index be215f43ec1d..853294d84fa9 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/cisco/Kconfig b/drivers/net/wireless/cisco/Kconfig new file mode 100644 index 000000000000..b22567dff893 --- /dev/null +++ b/drivers/net/wireless/cisco/Kconfig @@ -0,0 +1,56 @@ +config WLAN_VENDOR_CISCO + bool "Cisco 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_CISCO + +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 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. + +endif # WLAN_VENDOR_CISCO diff --git a/drivers/net/wireless/cisco/Makefile b/drivers/net/wireless/cisco/Makefile new file mode 100644 index 000000000000..d4110b19d6ef --- /dev/null +++ b/drivers/net/wireless/cisco/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_AIRO) += airo.o +obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/cisco/airo.c similarity index 100% rename from drivers/net/wireless/airo.c rename to drivers/net/wireless/cisco/airo.c diff --git a/drivers/net/wireless/airo.h b/drivers/net/wireless/cisco/airo.h similarity index 100% rename from drivers/net/wireless/airo.h rename to drivers/net/wireless/cisco/airo.h diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/cisco/airo_cs.c similarity index 100% rename from drivers/net/wireless/airo_cs.c rename to drivers/net/wireless/cisco/airo_cs.c From 30fe0f9b8c755d9aab04bb7c98ce9c7835c3bd24 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 19:49:20 +0200 Subject: [PATCH 03/27] atmel: move under atmel vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 44 +------------- drivers/net/wireless/Makefile | 7 +-- drivers/net/wireless/atmel/Kconfig | 57 +++++++++++++++++++ drivers/net/wireless/atmel/Makefile | 5 ++ .../net/wireless/{ => atmel}/at76c50x-usb.c | 0 .../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%) diff --git a/MAINTAINERS b/MAINTAINERS index f1adb66094f1..2f3ea01c101c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1992,7 +1992,7 @@ L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index ce5211ba1b29..275b6ed93f15 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -18,6 +18,7 @@ menuconfig WLAN if WLAN source "drivers/net/wireless/admtek/Kconfig" +source "drivers/net/wireless/atmel/Kconfig" source "drivers/net/wireless/cisco/Kconfig" config PCMCIA_RAYCS @@ -54,49 +55,6 @@ config LIBERTAS_THINFIRM_USB ---help--- A driver for Marvell Libertas 8388 USB devices using thinfirm. -config ATMEL - tristate "Atmel at76c50x chipset 802.11b support" - depends on CFG80211 && (PCI || PCMCIA) - select WIRELESS_EXT - select WEXT_PRIV - select FW_LOADER - select CRC32 - ---help--- - A driver 802.11b wireless cards based on the Atmel fast-vnet - chips. This driver supports standard Linux wireless extensions. - - Many cards based on this chipset do not have flash memory - and need their firmware loaded at start-up. If yours is - one of these, you will need to provide a firmware image - to be loaded into the card by the driver. The Atmel - firmware package can be downloaded from - - -config PCI_ATMEL - tristate "Atmel at76c506 PCI cards" - depends on ATMEL && PCI - ---help--- - Enable support for PCI and mini-PCI cards containing the - Atmel at76c506 chip. - -config PCMCIA_ATMEL - tristate "Atmel at76c502/at76c504 PCMCIA cards" - depends on ATMEL && PCMCIA - select WIRELESS_EXT - select FW_LOADER - select CRC32 - ---help--- - Enable support for PCMCIA cards containing the - Atmel at76c502 and at76c504 chips. - -config AT76C50X_USB - tristate "Atmel at76c503/at76c505/at76c505a USB cards" - depends on MAC80211 && USB - select FW_LOADER - ---help--- - Enable support for USB Wireless devices using Atmel at76c503, - at76c505 or at76c505a chips. - config PCMCIA_WL3501 tristate "Planet WL3501 PCMCIA cards" depends on CFG80211 && PCMCIA diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 853294d84fa9..87eb6b2f3227 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/atmel/Kconfig b/drivers/net/wireless/atmel/Kconfig new file mode 100644 index 000000000000..a43cfd163254 --- /dev/null +++ b/drivers/net/wireless/atmel/Kconfig @@ -0,0 +1,57 @@ +config WLAN_VENDOR_ATMEL + bool "Atmel 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_ATMEL + +config ATMEL + tristate "Atmel at76c50x chipset 802.11b support" + depends on CFG80211 && (PCI || PCMCIA) + select WIRELESS_EXT + select WEXT_PRIV + select FW_LOADER + select CRC32 + ---help--- + A driver 802.11b wireless cards based on the Atmel fast-vnet + chips. This driver supports standard Linux wireless extensions. + + Many cards based on this chipset do not have flash memory + and need their firmware loaded at start-up. If yours is + one of these, you will need to provide a firmware image + to be loaded into the card by the driver. The Atmel + firmware package can be downloaded from + + +config PCI_ATMEL + tristate "Atmel at76c506 PCI cards" + depends on ATMEL && PCI + ---help--- + Enable support for PCI and mini-PCI cards containing the + Atmel at76c506 chip. + +config PCMCIA_ATMEL + tristate "Atmel at76c502/at76c504 PCMCIA cards" + depends on ATMEL && PCMCIA + select WIRELESS_EXT + select FW_LOADER + select CRC32 + ---help--- + Enable support for PCMCIA cards containing the + Atmel at76c502 and at76c504 chips. + +config AT76C50X_USB + tristate "Atmel at76c503/at76c505/at76c505a USB cards" + depends on MAC80211 && USB + select FW_LOADER + ---help--- + Enable support for USB Wireless devices using Atmel at76c503, + at76c505 or at76c505a chips. + +endif # WLAN_VENDOR_ATMEL diff --git a/drivers/net/wireless/atmel/Makefile b/drivers/net/wireless/atmel/Makefile new file mode 100644 index 000000000000..e62e345f7af6 --- /dev/null +++ b/drivers/net/wireless/atmel/Makefile @@ -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 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c similarity index 100% rename from drivers/net/wireless/at76c50x-usb.c rename to drivers/net/wireless/atmel/at76c50x-usb.c diff --git a/drivers/net/wireless/at76c50x-usb.h b/drivers/net/wireless/atmel/at76c50x-usb.h similarity index 100% rename from drivers/net/wireless/at76c50x-usb.h rename to drivers/net/wireless/atmel/at76c50x-usb.h diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel/atmel.c similarity index 100% rename from drivers/net/wireless/atmel.c rename to drivers/net/wireless/atmel/atmel.c diff --git a/drivers/net/wireless/atmel.h b/drivers/net/wireless/atmel/atmel.h similarity index 100% rename from drivers/net/wireless/atmel.h rename to drivers/net/wireless/atmel/atmel.h diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel/atmel_cs.c similarity index 100% rename from drivers/net/wireless/atmel_cs.c rename to drivers/net/wireless/atmel/atmel_cs.c diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel/atmel_pci.c similarity index 100% rename from drivers/net/wireless/atmel_pci.c rename to drivers/net/wireless/atmel/atmel_pci.c From 58619b14d106e453e3924810fac16a8644b04db1 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 19:49:23 +0200 Subject: [PATCH 04/27] b43: move under broadcom vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 .../net/wireless/{ => broadcom}/b43/debugfs.c | 0 .../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 .../net/wireless/{ => broadcom}/b43/phy_lcn.c | 0 .../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 .../wireless/{ => broadcom}/b43/tables_lpphy.c | 0 .../wireless/{ => broadcom}/b43/tables_lpphy.h | 0 .../wireless/{ => broadcom}/b43/tables_nphy.c | 0 .../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%) diff --git a/MAINTAINERS b/MAINTAINERS index 2f3ea01c101c..68793777fdb5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2081,7 +2081,7 @@ L: linux-wireless@vger.kernel.org L: b43-dev@lists.infradead.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 275b6ed93f15..0c47f2ca2207 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 87eb6b2f3227..7907674ad5b4 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/broadcom/Kconfig b/drivers/net/wireless/broadcom/Kconfig new file mode 100644 index 000000000000..0ba8119d2cf2 --- /dev/null +++ b/drivers/net/wireless/broadcom/Kconfig @@ -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 diff --git a/drivers/net/wireless/broadcom/Makefile b/drivers/net/wireless/broadcom/Makefile new file mode 100644 index 000000000000..0140a810107c --- /dev/null +++ b/drivers/net/wireless/broadcom/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_B43) += b43/ diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/broadcom/b43/Kconfig similarity index 100% rename from drivers/net/wireless/b43/Kconfig rename to drivers/net/wireless/broadcom/b43/Kconfig diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/broadcom/b43/Makefile similarity index 100% rename from drivers/net/wireless/b43/Makefile rename to drivers/net/wireless/broadcom/b43/Makefile diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/broadcom/b43/b43.h similarity index 100% rename from drivers/net/wireless/b43/b43.h rename to drivers/net/wireless/broadcom/b43/b43.h diff --git a/drivers/net/wireless/b43/bus.c b/drivers/net/wireless/broadcom/b43/bus.c similarity index 100% rename from drivers/net/wireless/b43/bus.c rename to drivers/net/wireless/broadcom/b43/bus.c diff --git a/drivers/net/wireless/b43/bus.h b/drivers/net/wireless/broadcom/b43/bus.h similarity index 100% rename from drivers/net/wireless/b43/bus.h rename to drivers/net/wireless/broadcom/b43/bus.h diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/broadcom/b43/debugfs.c similarity index 100% rename from drivers/net/wireless/b43/debugfs.c rename to drivers/net/wireless/broadcom/b43/debugfs.c diff --git a/drivers/net/wireless/b43/debugfs.h b/drivers/net/wireless/broadcom/b43/debugfs.h similarity index 100% rename from drivers/net/wireless/b43/debugfs.h rename to drivers/net/wireless/broadcom/b43/debugfs.h diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/broadcom/b43/dma.c similarity index 100% rename from drivers/net/wireless/b43/dma.c rename to drivers/net/wireless/broadcom/b43/dma.c diff --git a/drivers/net/wireless/b43/dma.h b/drivers/net/wireless/broadcom/b43/dma.h similarity index 100% rename from drivers/net/wireless/b43/dma.h rename to drivers/net/wireless/broadcom/b43/dma.h diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/broadcom/b43/leds.c similarity index 100% rename from drivers/net/wireless/b43/leds.c rename to drivers/net/wireless/broadcom/b43/leds.c diff --git a/drivers/net/wireless/b43/leds.h b/drivers/net/wireless/broadcom/b43/leds.h similarity index 100% rename from drivers/net/wireless/b43/leds.h rename to drivers/net/wireless/broadcom/b43/leds.h diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/broadcom/b43/lo.c similarity index 100% rename from drivers/net/wireless/b43/lo.c rename to drivers/net/wireless/broadcom/b43/lo.c diff --git a/drivers/net/wireless/b43/lo.h b/drivers/net/wireless/broadcom/b43/lo.h similarity index 100% rename from drivers/net/wireless/b43/lo.h rename to drivers/net/wireless/broadcom/b43/lo.h diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c similarity index 100% rename from drivers/net/wireless/b43/main.c rename to drivers/net/wireless/broadcom/b43/main.c diff --git a/drivers/net/wireless/b43/main.h b/drivers/net/wireless/broadcom/b43/main.h similarity index 100% rename from drivers/net/wireless/b43/main.h rename to drivers/net/wireless/broadcom/b43/main.h diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/broadcom/b43/phy_a.c similarity index 100% rename from drivers/net/wireless/b43/phy_a.c rename to drivers/net/wireless/broadcom/b43/phy_a.c diff --git a/drivers/net/wireless/b43/phy_a.h b/drivers/net/wireless/broadcom/b43/phy_a.h similarity index 100% rename from drivers/net/wireless/b43/phy_a.h rename to drivers/net/wireless/broadcom/b43/phy_a.h diff --git a/drivers/net/wireless/b43/phy_ac.c b/drivers/net/wireless/broadcom/b43/phy_ac.c similarity index 100% rename from drivers/net/wireless/b43/phy_ac.c rename to drivers/net/wireless/broadcom/b43/phy_ac.c diff --git a/drivers/net/wireless/b43/phy_ac.h b/drivers/net/wireless/broadcom/b43/phy_ac.h similarity index 100% rename from drivers/net/wireless/b43/phy_ac.h rename to drivers/net/wireless/broadcom/b43/phy_ac.h diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/broadcom/b43/phy_common.c similarity index 100% rename from drivers/net/wireless/b43/phy_common.c rename to drivers/net/wireless/broadcom/b43/phy_common.c diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/broadcom/b43/phy_common.h similarity index 100% rename from drivers/net/wireless/b43/phy_common.h rename to drivers/net/wireless/broadcom/b43/phy_common.h diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/broadcom/b43/phy_g.c similarity index 100% rename from drivers/net/wireless/b43/phy_g.c rename to drivers/net/wireless/broadcom/b43/phy_g.c diff --git a/drivers/net/wireless/b43/phy_g.h b/drivers/net/wireless/broadcom/b43/phy_g.h similarity index 100% rename from drivers/net/wireless/b43/phy_g.h rename to drivers/net/wireless/broadcom/b43/phy_g.h diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/broadcom/b43/phy_ht.c similarity index 100% rename from drivers/net/wireless/b43/phy_ht.c rename to drivers/net/wireless/broadcom/b43/phy_ht.c diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/broadcom/b43/phy_ht.h similarity index 100% rename from drivers/net/wireless/b43/phy_ht.h rename to drivers/net/wireless/broadcom/b43/phy_ht.h diff --git a/drivers/net/wireless/b43/phy_lcn.c b/drivers/net/wireless/broadcom/b43/phy_lcn.c similarity index 100% rename from drivers/net/wireless/b43/phy_lcn.c rename to drivers/net/wireless/broadcom/b43/phy_lcn.c diff --git a/drivers/net/wireless/b43/phy_lcn.h b/drivers/net/wireless/broadcom/b43/phy_lcn.h similarity index 100% rename from drivers/net/wireless/b43/phy_lcn.h rename to drivers/net/wireless/broadcom/b43/phy_lcn.h diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/broadcom/b43/phy_lp.c similarity index 100% rename from drivers/net/wireless/b43/phy_lp.c rename to drivers/net/wireless/broadcom/b43/phy_lp.c diff --git a/drivers/net/wireless/b43/phy_lp.h b/drivers/net/wireless/broadcom/b43/phy_lp.h similarity index 100% rename from drivers/net/wireless/b43/phy_lp.h rename to drivers/net/wireless/broadcom/b43/phy_lp.h diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/broadcom/b43/phy_n.c similarity index 100% rename from drivers/net/wireless/b43/phy_n.c rename to drivers/net/wireless/broadcom/b43/phy_n.c diff --git a/drivers/net/wireless/b43/phy_n.h b/drivers/net/wireless/broadcom/b43/phy_n.h similarity index 100% rename from drivers/net/wireless/b43/phy_n.h rename to drivers/net/wireless/broadcom/b43/phy_n.h diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/broadcom/b43/pio.c similarity index 100% rename from drivers/net/wireless/b43/pio.c rename to drivers/net/wireless/broadcom/b43/pio.c diff --git a/drivers/net/wireless/b43/pio.h b/drivers/net/wireless/broadcom/b43/pio.h similarity index 100% rename from drivers/net/wireless/b43/pio.h rename to drivers/net/wireless/broadcom/b43/pio.h diff --git a/drivers/net/wireless/b43/ppr.c b/drivers/net/wireless/broadcom/b43/ppr.c similarity index 100% rename from drivers/net/wireless/b43/ppr.c rename to drivers/net/wireless/broadcom/b43/ppr.c diff --git a/drivers/net/wireless/b43/ppr.h b/drivers/net/wireless/broadcom/b43/ppr.h similarity index 100% rename from drivers/net/wireless/b43/ppr.h rename to drivers/net/wireless/broadcom/b43/ppr.h diff --git a/drivers/net/wireless/b43/radio_2055.c b/drivers/net/wireless/broadcom/b43/radio_2055.c similarity index 100% rename from drivers/net/wireless/b43/radio_2055.c rename to drivers/net/wireless/broadcom/b43/radio_2055.c diff --git a/drivers/net/wireless/b43/radio_2055.h b/drivers/net/wireless/broadcom/b43/radio_2055.h similarity index 100% rename from drivers/net/wireless/b43/radio_2055.h rename to drivers/net/wireless/broadcom/b43/radio_2055.h diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/broadcom/b43/radio_2056.c similarity index 100% rename from drivers/net/wireless/b43/radio_2056.c rename to drivers/net/wireless/broadcom/b43/radio_2056.c diff --git a/drivers/net/wireless/b43/radio_2056.h b/drivers/net/wireless/broadcom/b43/radio_2056.h similarity index 100% rename from drivers/net/wireless/b43/radio_2056.h rename to drivers/net/wireless/broadcom/b43/radio_2056.h diff --git a/drivers/net/wireless/b43/radio_2057.c b/drivers/net/wireless/broadcom/b43/radio_2057.c similarity index 100% rename from drivers/net/wireless/b43/radio_2057.c rename to drivers/net/wireless/broadcom/b43/radio_2057.c diff --git a/drivers/net/wireless/b43/radio_2057.h b/drivers/net/wireless/broadcom/b43/radio_2057.h similarity index 100% rename from drivers/net/wireless/b43/radio_2057.h rename to drivers/net/wireless/broadcom/b43/radio_2057.h diff --git a/drivers/net/wireless/b43/radio_2059.c b/drivers/net/wireless/broadcom/b43/radio_2059.c similarity index 100% rename from drivers/net/wireless/b43/radio_2059.c rename to drivers/net/wireless/broadcom/b43/radio_2059.c diff --git a/drivers/net/wireless/b43/radio_2059.h b/drivers/net/wireless/broadcom/b43/radio_2059.h similarity index 100% rename from drivers/net/wireless/b43/radio_2059.h rename to drivers/net/wireless/broadcom/b43/radio_2059.h diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/broadcom/b43/rfkill.c similarity index 100% rename from drivers/net/wireless/b43/rfkill.c rename to drivers/net/wireless/broadcom/b43/rfkill.c diff --git a/drivers/net/wireless/b43/rfkill.h b/drivers/net/wireless/broadcom/b43/rfkill.h similarity index 100% rename from drivers/net/wireless/b43/rfkill.h rename to drivers/net/wireless/broadcom/b43/rfkill.h diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/broadcom/b43/sdio.c similarity index 100% rename from drivers/net/wireless/b43/sdio.c rename to drivers/net/wireless/broadcom/b43/sdio.c diff --git a/drivers/net/wireless/b43/sdio.h b/drivers/net/wireless/broadcom/b43/sdio.h similarity index 100% rename from drivers/net/wireless/b43/sdio.h rename to drivers/net/wireless/broadcom/b43/sdio.h diff --git a/drivers/net/wireless/b43/sysfs.c b/drivers/net/wireless/broadcom/b43/sysfs.c similarity index 100% rename from drivers/net/wireless/b43/sysfs.c rename to drivers/net/wireless/broadcom/b43/sysfs.c diff --git a/drivers/net/wireless/b43/sysfs.h b/drivers/net/wireless/broadcom/b43/sysfs.h similarity index 100% rename from drivers/net/wireless/b43/sysfs.h rename to drivers/net/wireless/broadcom/b43/sysfs.h diff --git a/drivers/net/wireless/b43/tables.c b/drivers/net/wireless/broadcom/b43/tables.c similarity index 100% rename from drivers/net/wireless/b43/tables.c rename to drivers/net/wireless/broadcom/b43/tables.c diff --git a/drivers/net/wireless/b43/tables.h b/drivers/net/wireless/broadcom/b43/tables.h similarity index 100% rename from drivers/net/wireless/b43/tables.h rename to drivers/net/wireless/broadcom/b43/tables.h diff --git a/drivers/net/wireless/b43/tables_lpphy.c b/drivers/net/wireless/broadcom/b43/tables_lpphy.c similarity index 100% rename from drivers/net/wireless/b43/tables_lpphy.c rename to drivers/net/wireless/broadcom/b43/tables_lpphy.c diff --git a/drivers/net/wireless/b43/tables_lpphy.h b/drivers/net/wireless/broadcom/b43/tables_lpphy.h similarity index 100% rename from drivers/net/wireless/b43/tables_lpphy.h rename to drivers/net/wireless/broadcom/b43/tables_lpphy.h diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/broadcom/b43/tables_nphy.c similarity index 100% rename from drivers/net/wireless/b43/tables_nphy.c rename to drivers/net/wireless/broadcom/b43/tables_nphy.c diff --git a/drivers/net/wireless/b43/tables_nphy.h b/drivers/net/wireless/broadcom/b43/tables_nphy.h similarity index 100% rename from drivers/net/wireless/b43/tables_nphy.h rename to drivers/net/wireless/broadcom/b43/tables_nphy.h diff --git a/drivers/net/wireless/b43/tables_phy_ht.c b/drivers/net/wireless/broadcom/b43/tables_phy_ht.c similarity index 100% rename from drivers/net/wireless/b43/tables_phy_ht.c rename to drivers/net/wireless/broadcom/b43/tables_phy_ht.c diff --git a/drivers/net/wireless/b43/tables_phy_ht.h b/drivers/net/wireless/broadcom/b43/tables_phy_ht.h similarity index 100% rename from drivers/net/wireless/b43/tables_phy_ht.h rename to drivers/net/wireless/broadcom/b43/tables_phy_ht.h diff --git a/drivers/net/wireless/b43/tables_phy_lcn.c b/drivers/net/wireless/broadcom/b43/tables_phy_lcn.c similarity index 100% rename from drivers/net/wireless/b43/tables_phy_lcn.c rename to drivers/net/wireless/broadcom/b43/tables_phy_lcn.c diff --git a/drivers/net/wireless/b43/tables_phy_lcn.h b/drivers/net/wireless/broadcom/b43/tables_phy_lcn.h similarity index 100% rename from drivers/net/wireless/b43/tables_phy_lcn.h rename to drivers/net/wireless/broadcom/b43/tables_phy_lcn.h diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/broadcom/b43/wa.c similarity index 100% rename from drivers/net/wireless/b43/wa.c rename to drivers/net/wireless/broadcom/b43/wa.c diff --git a/drivers/net/wireless/b43/wa.h b/drivers/net/wireless/broadcom/b43/wa.h similarity index 100% rename from drivers/net/wireless/b43/wa.h rename to drivers/net/wireless/broadcom/b43/wa.h diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/broadcom/b43/xmit.c similarity index 100% rename from drivers/net/wireless/b43/xmit.c rename to drivers/net/wireless/broadcom/b43/xmit.c diff --git a/drivers/net/wireless/b43/xmit.h b/drivers/net/wireless/broadcom/b43/xmit.h similarity index 100% rename from drivers/net/wireless/b43/xmit.h rename to drivers/net/wireless/broadcom/b43/xmit.h From 423e3ce336499ddb4e094f40649d12d9820f785b Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 19:49:26 +0200 Subject: [PATCH 05/27] b43legacy: move under broadcom vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 1 - drivers/net/wireless/Makefile | 1 - drivers/net/wireless/broadcom/Kconfig | 1 + drivers/net/wireless/broadcom/Makefile | 1 + drivers/net/wireless/{ => broadcom}/b43legacy/Kconfig | 0 drivers/net/wireless/{ => broadcom}/b43legacy/Makefile | 0 drivers/net/wireless/{ => broadcom}/b43legacy/b43legacy.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/dma.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/dma.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/ilt.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/ilt.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/leds.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/leds.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/main.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/main.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/phy.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/phy.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/pio.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/pio.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/radio.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/radio.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.c | 0 drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.h | 0 drivers/net/wireless/{ => broadcom}/b43legacy/xmit.c | 0 drivers/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%) diff --git a/MAINTAINERS b/MAINTAINERS index 68793777fdb5..dd20c0b1eb02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2089,7 +2089,7 @@ L: linux-wireless@vger.kernel.org L: b43-dev@lists.infradead.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 0c47f2ca2207..e261df26b0dd 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 7907674ad5b4..13ac61737acd 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/broadcom/Kconfig b/drivers/net/wireless/broadcom/Kconfig index 0ba8119d2cf2..323e738dd96f 100644 --- a/drivers/net/wireless/broadcom/Kconfig +++ b/drivers/net/wireless/broadcom/Kconfig @@ -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 diff --git a/drivers/net/wireless/broadcom/Makefile b/drivers/net/wireless/broadcom/Makefile index 0140a810107c..66d7cc461fcf 100644 --- a/drivers/net/wireless/broadcom/Makefile +++ b/drivers/net/wireless/broadcom/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_B43) += b43/ +obj-$(CONFIG_B43LEGACY) += b43legacy/ diff --git a/drivers/net/wireless/b43legacy/Kconfig b/drivers/net/wireless/broadcom/b43legacy/Kconfig similarity index 100% rename from drivers/net/wireless/b43legacy/Kconfig rename to drivers/net/wireless/broadcom/b43legacy/Kconfig diff --git a/drivers/net/wireless/b43legacy/Makefile b/drivers/net/wireless/broadcom/b43legacy/Makefile similarity index 100% rename from drivers/net/wireless/b43legacy/Makefile rename to drivers/net/wireless/broadcom/b43legacy/Makefile diff --git a/drivers/net/wireless/b43legacy/b43legacy.h b/drivers/net/wireless/broadcom/b43legacy/b43legacy.h similarity index 100% rename from drivers/net/wireless/b43legacy/b43legacy.h rename to drivers/net/wireless/broadcom/b43legacy/b43legacy.h diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/broadcom/b43legacy/debugfs.c similarity index 100% rename from drivers/net/wireless/b43legacy/debugfs.c rename to drivers/net/wireless/broadcom/b43legacy/debugfs.c diff --git a/drivers/net/wireless/b43legacy/debugfs.h b/drivers/net/wireless/broadcom/b43legacy/debugfs.h similarity index 100% rename from drivers/net/wireless/b43legacy/debugfs.h rename to drivers/net/wireless/broadcom/b43legacy/debugfs.h diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/broadcom/b43legacy/dma.c similarity index 100% rename from drivers/net/wireless/b43legacy/dma.c rename to drivers/net/wireless/broadcom/b43legacy/dma.c diff --git a/drivers/net/wireless/b43legacy/dma.h b/drivers/net/wireless/broadcom/b43legacy/dma.h similarity index 100% rename from drivers/net/wireless/b43legacy/dma.h rename to drivers/net/wireless/broadcom/b43legacy/dma.h diff --git a/drivers/net/wireless/b43legacy/ilt.c b/drivers/net/wireless/broadcom/b43legacy/ilt.c similarity index 100% rename from drivers/net/wireless/b43legacy/ilt.c rename to drivers/net/wireless/broadcom/b43legacy/ilt.c diff --git a/drivers/net/wireless/b43legacy/ilt.h b/drivers/net/wireless/broadcom/b43legacy/ilt.h similarity index 100% rename from drivers/net/wireless/b43legacy/ilt.h rename to drivers/net/wireless/broadcom/b43legacy/ilt.h diff --git a/drivers/net/wireless/b43legacy/leds.c b/drivers/net/wireless/broadcom/b43legacy/leds.c similarity index 100% rename from drivers/net/wireless/b43legacy/leds.c rename to drivers/net/wireless/broadcom/b43legacy/leds.c diff --git a/drivers/net/wireless/b43legacy/leds.h b/drivers/net/wireless/broadcom/b43legacy/leds.h similarity index 100% rename from drivers/net/wireless/b43legacy/leds.h rename to drivers/net/wireless/broadcom/b43legacy/leds.h diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c similarity index 100% rename from drivers/net/wireless/b43legacy/main.c rename to drivers/net/wireless/broadcom/b43legacy/main.c diff --git a/drivers/net/wireless/b43legacy/main.h b/drivers/net/wireless/broadcom/b43legacy/main.h similarity index 100% rename from drivers/net/wireless/b43legacy/main.h rename to drivers/net/wireless/broadcom/b43legacy/main.h diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/broadcom/b43legacy/phy.c similarity index 100% rename from drivers/net/wireless/b43legacy/phy.c rename to drivers/net/wireless/broadcom/b43legacy/phy.c diff --git a/drivers/net/wireless/b43legacy/phy.h b/drivers/net/wireless/broadcom/b43legacy/phy.h similarity index 100% rename from drivers/net/wireless/b43legacy/phy.h rename to drivers/net/wireless/broadcom/b43legacy/phy.h diff --git a/drivers/net/wireless/b43legacy/pio.c b/drivers/net/wireless/broadcom/b43legacy/pio.c similarity index 100% rename from drivers/net/wireless/b43legacy/pio.c rename to drivers/net/wireless/broadcom/b43legacy/pio.c diff --git a/drivers/net/wireless/b43legacy/pio.h b/drivers/net/wireless/broadcom/b43legacy/pio.h similarity index 100% rename from drivers/net/wireless/b43legacy/pio.h rename to drivers/net/wireless/broadcom/b43legacy/pio.h diff --git a/drivers/net/wireless/b43legacy/radio.c b/drivers/net/wireless/broadcom/b43legacy/radio.c similarity index 100% rename from drivers/net/wireless/b43legacy/radio.c rename to drivers/net/wireless/broadcom/b43legacy/radio.c diff --git a/drivers/net/wireless/b43legacy/radio.h b/drivers/net/wireless/broadcom/b43legacy/radio.h similarity index 100% rename from drivers/net/wireless/b43legacy/radio.h rename to drivers/net/wireless/broadcom/b43legacy/radio.h diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/broadcom/b43legacy/rfkill.c similarity index 100% rename from drivers/net/wireless/b43legacy/rfkill.c rename to drivers/net/wireless/broadcom/b43legacy/rfkill.c diff --git a/drivers/net/wireless/b43legacy/rfkill.h b/drivers/net/wireless/broadcom/b43legacy/rfkill.h similarity index 100% rename from drivers/net/wireless/b43legacy/rfkill.h rename to drivers/net/wireless/broadcom/b43legacy/rfkill.h diff --git a/drivers/net/wireless/b43legacy/sysfs.c b/drivers/net/wireless/broadcom/b43legacy/sysfs.c similarity index 100% rename from drivers/net/wireless/b43legacy/sysfs.c rename to drivers/net/wireless/broadcom/b43legacy/sysfs.c diff --git a/drivers/net/wireless/b43legacy/sysfs.h b/drivers/net/wireless/broadcom/b43legacy/sysfs.h similarity index 100% rename from drivers/net/wireless/b43legacy/sysfs.h rename to drivers/net/wireless/broadcom/b43legacy/sysfs.h diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/broadcom/b43legacy/xmit.c similarity index 100% rename from drivers/net/wireless/b43legacy/xmit.c rename to drivers/net/wireless/broadcom/b43legacy/xmit.c diff --git a/drivers/net/wireless/b43legacy/xmit.h b/drivers/net/wireless/broadcom/b43legacy/xmit.h similarity index 100% rename from drivers/net/wireless/b43legacy/xmit.h rename to drivers/net/wireless/broadcom/b43legacy/xmit.h From 05491d2ccf20b20a1375303441fbbfbd12b24a4f Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 19:52:05 +0200 Subject: [PATCH 06/27] brcm80211: move under broadcom vendor directory Part of reorganising wireless drivers directory and Kconfig. Note that I had to edit Makefiles from subdirectories to use the new location. Signed-off-by: Kalle Valo --- MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 1 - drivers/net/wireless/Makefile | 3 --- drivers/net/wireless/broadcom/Kconfig | 1 + drivers/net/wireless/broadcom/Makefile | 3 +++ drivers/net/wireless/{ => broadcom}/brcm80211/Kconfig | 0 drivers/net/wireless/{ => broadcom}/brcm80211/Makefile | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/Makefile | 4 ++-- .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/bus.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/feature.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/feature.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/fwil_types.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.h | 0 drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.c | 0 drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/Makefile | 6 +++--- .../wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.c | 0 .../net/wireless/{ => 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 .../{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmsmac/channel.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmsmac/channel.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/d11.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/mac80211_if.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/mac80211_if.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_cmn.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_hal.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_int.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_radio.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phyreg_n.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.h | 0 .../wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.c | 0 .../wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/pub.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/scb.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmsmac/types.h | 0 .../{ => broadcom}/brcm80211/brcmsmac/ucode_loader.c | 0 .../{ => broadcom}/brcm80211/brcmsmac/ucode_loader.h | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmutil/Makefile | 4 ++-- .../net/wireless/{ => broadcom}/brcm80211/brcmutil/d11.c | 0 .../net/wireless/{ => broadcom}/brcm80211/brcmutil/utils.c | 0 .../wireless/{ => broadcom}/brcm80211/include/brcm_hw_ids.h | 0 .../wireless/{ => broadcom}/brcm80211/include/brcmu_d11.h | 0 .../wireless/{ => broadcom}/brcm80211/include/brcmu_utils.h | 0 .../wireless/{ => broadcom}/brcm80211/include/brcmu_wifi.h | 0 .../wireless/{ => broadcom}/brcm80211/include/chipcommon.h | 0 .../net/wireless/{ => broadcom}/brcm80211/include/defs.h | 0 drivers/net/wireless/{ => 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%) diff --git a/MAINTAINERS b/MAINTAINERS index dd20c0b1eb02..748ee82f2ebe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2390,7 +2390,7 @@ M: Hante Meuleman L: linux-wireless@vger.kernel.org L: brcm80211-dev-list@broadcom.com S: Supported -F: drivers/net/wireless/brcm80211/ +F: drivers/net/wireless/broadcom/brcm80211/ BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER M: QLogic-Storage-Upstream@qlogic.com diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index e261df26b0dd..c627d9e41ede 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 13ac61737acd..41ebe5641c01 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/broadcom/Kconfig b/drivers/net/wireless/broadcom/Kconfig index 323e738dd96f..d3651ceb5046 100644 --- a/drivers/net/wireless/broadcom/Kconfig +++ b/drivers/net/wireless/broadcom/Kconfig @@ -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 diff --git a/drivers/net/wireless/broadcom/Makefile b/drivers/net/wireless/broadcom/Makefile index 66d7cc461fcf..9d5ac95710c3 100644 --- a/drivers/net/wireless/broadcom/Makefile +++ b/drivers/net/wireless/broadcom/Makefile @@ -1,2 +1,5 @@ obj-$(CONFIG_B43) += b43/ obj-$(CONFIG_B43LEGACY) += b43legacy/ + +obj-$(CONFIG_BRCMFMAC) += brcm80211/ +obj-$(CONFIG_BRCMSMAC) += brcm80211/ diff --git a/drivers/net/wireless/brcm80211/Kconfig b/drivers/net/wireless/broadcom/brcm80211/Kconfig similarity index 100% rename from drivers/net/wireless/brcm80211/Kconfig rename to drivers/net/wireless/broadcom/brcm80211/Kconfig diff --git a/drivers/net/wireless/brcm80211/Makefile b/drivers/net/wireless/broadcom/brcm80211/Makefile similarity index 100% rename from drivers/net/wireless/brcm80211/Makefile rename to drivers/net/wireless/broadcom/brcm80211/Makefile diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile similarity index 93% rename from drivers/net/wireless/brcm80211/brcmfmac/Makefile rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile index dc4c75083085..9e4b505ca593 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile @@ -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__ diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/bcdc.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/bcdc.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/btcoex.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/btcoex.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/btcoex.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/bus.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/chip.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/chip.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/chip.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/common.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/common.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/commonring.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/commonring.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/commonring.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/commonring.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/commonring.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/core.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/core.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/debug.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/debug.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/feature.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/feature.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/firmware.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/firmware.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/flowring.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/flowring.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/flowring.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/flowring.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fweh.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fweh.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fwil.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fwil.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/msgbuf.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/of.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/of.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/of.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/p2p.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/p2p.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/pcie.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/pcie.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/proto.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/proto.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/proto.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/sdio.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/sdio.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/usb.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/usb.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.h diff --git a/drivers/net/wireless/brcm80211/brcmfmac/vendor.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/vendor.c rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c diff --git a/drivers/net/wireless/brcm80211/brcmfmac/vendor.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmfmac/vendor.h rename to drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile similarity index 88% rename from drivers/net/wireless/brcm80211/brcmsmac/Makefile rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile index 32464acccd90..960e6b86bbcb 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile @@ -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 \ diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/aiutils.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/aiutils.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/ampdu.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/ampdu.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/antsel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/antsel.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/antsel.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/antsel.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/brcms_trace_events.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_events.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/channel.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/channel.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/d11.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/d11.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/d11.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/debug.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/debug.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/debug.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/debug.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/dma.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/dma.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/led.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/led.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/led.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/led.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/main.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/main.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_hal.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_hal.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_int.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_n.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_qmath.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_radio.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_radio.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phyreg_n.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_lcn.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phytbl_n.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h 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 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/phy_shim.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/pmu.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pmu.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/pmu.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/pmu.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/pub.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/pub.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/pub.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/rate.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/rate.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/rate.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/rate.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/rate.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/scb.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/scb.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/scb.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/stf.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/stf.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/stf.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/stf.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/stf.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/types.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/types.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/types.h diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.c rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.c diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.h similarity index 100% rename from drivers/net/wireless/brcm80211/brcmsmac/ucode_loader.h rename to drivers/net/wireless/broadcom/brcm80211/brcmsmac/ucode_loader.h diff --git a/drivers/net/wireless/brcm80211/brcmutil/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile similarity index 89% rename from drivers/net/wireless/brcm80211/brcmutil/Makefile rename to drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile index 8a928184016a..256c91f9ac4b 100644 --- a/drivers/net/wireless/brcm80211/brcmutil/Makefile +++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile @@ -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 diff --git a/drivers/net/wireless/brcm80211/brcmutil/d11.c b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmutil/d11.c rename to drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c similarity index 100% rename from drivers/net/wireless/brcm80211/brcmutil/utils.c rename to drivers/net/wireless/broadcom/brcm80211/brcmutil/utils.c diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h 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 diff --git a/drivers/net/wireless/brcm80211/include/brcmu_d11.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h similarity index 100% rename from drivers/net/wireless/brcm80211/include/brcmu_d11.h rename to drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h diff --git a/drivers/net/wireless/brcm80211/include/brcmu_utils.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h similarity index 100% rename from drivers/net/wireless/brcm80211/include/brcmu_utils.h rename to drivers/net/wireless/broadcom/brcm80211/include/brcmu_utils.h diff --git a/drivers/net/wireless/brcm80211/include/brcmu_wifi.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h similarity index 100% rename from drivers/net/wireless/brcm80211/include/brcmu_wifi.h rename to drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h diff --git a/drivers/net/wireless/brcm80211/include/chipcommon.h b/drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h similarity index 100% rename from drivers/net/wireless/brcm80211/include/chipcommon.h rename to drivers/net/wireless/broadcom/brcm80211/include/chipcommon.h diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/broadcom/brcm80211/include/defs.h similarity index 100% rename from drivers/net/wireless/brcm80211/include/defs.h rename to drivers/net/wireless/broadcom/brcm80211/include/defs.h diff --git a/drivers/net/wireless/brcm80211/include/soc.h b/drivers/net/wireless/broadcom/brcm80211/include/soc.h similarity index 100% rename from drivers/net/wireless/brcm80211/include/soc.h rename to drivers/net/wireless/broadcom/brcm80211/include/soc.h From 560424e9a979a7b460055bda497bb4522ba5cc87 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 20:09:02 +0200 Subject: [PATCH 07/27] cw1200: move under st vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 .../net/wireless/{ => st}/cw1200/cw1200_sdio.c | 0 .../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%) diff --git a/MAINTAINERS b/MAINTAINERS index 748ee82f2ebe..4cbd4641e6fb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3100,7 +3100,7 @@ F: sound/pci/cs5535audio/ CW1200 WLAN driver M: Solomon Peachy S: Maintained -F: drivers/net/wireless/cw1200/ +F: drivers/net/wireless/st/cw1200/ CX18 VIDEO4LINUX DRIVER M: Andy Walls diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index c627d9e41ede..c1742f228fec 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 41ebe5641c01..d7211a7949e6 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/st/Kconfig b/drivers/net/wireless/st/Kconfig new file mode 100644 index 000000000000..969b4f6e53b5 --- /dev/null +++ b/drivers/net/wireless/st/Kconfig @@ -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 diff --git a/drivers/net/wireless/st/Makefile b/drivers/net/wireless/st/Makefile new file mode 100644 index 000000000000..a60d6350ba46 --- /dev/null +++ b/drivers/net/wireless/st/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_CW1200) += cw1200/ diff --git a/drivers/net/wireless/cw1200/Kconfig b/drivers/net/wireless/st/cw1200/Kconfig similarity index 100% rename from drivers/net/wireless/cw1200/Kconfig rename to drivers/net/wireless/st/cw1200/Kconfig diff --git a/drivers/net/wireless/cw1200/Makefile b/drivers/net/wireless/st/cw1200/Makefile similarity index 100% rename from drivers/net/wireless/cw1200/Makefile rename to drivers/net/wireless/st/cw1200/Makefile diff --git a/drivers/net/wireless/cw1200/bh.c b/drivers/net/wireless/st/cw1200/bh.c similarity index 100% rename from drivers/net/wireless/cw1200/bh.c rename to drivers/net/wireless/st/cw1200/bh.c diff --git a/drivers/net/wireless/cw1200/bh.h b/drivers/net/wireless/st/cw1200/bh.h similarity index 100% rename from drivers/net/wireless/cw1200/bh.h rename to drivers/net/wireless/st/cw1200/bh.h diff --git a/drivers/net/wireless/cw1200/cw1200.h b/drivers/net/wireless/st/cw1200/cw1200.h similarity index 100% rename from drivers/net/wireless/cw1200/cw1200.h rename to drivers/net/wireless/st/cw1200/cw1200.h diff --git a/drivers/net/wireless/cw1200/cw1200_sdio.c b/drivers/net/wireless/st/cw1200/cw1200_sdio.c similarity index 100% rename from drivers/net/wireless/cw1200/cw1200_sdio.c rename to drivers/net/wireless/st/cw1200/cw1200_sdio.c diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/st/cw1200/cw1200_spi.c similarity index 100% rename from drivers/net/wireless/cw1200/cw1200_spi.c rename to drivers/net/wireless/st/cw1200/cw1200_spi.c diff --git a/drivers/net/wireless/cw1200/debug.c b/drivers/net/wireless/st/cw1200/debug.c similarity index 100% rename from drivers/net/wireless/cw1200/debug.c rename to drivers/net/wireless/st/cw1200/debug.c diff --git a/drivers/net/wireless/cw1200/debug.h b/drivers/net/wireless/st/cw1200/debug.h similarity index 100% rename from drivers/net/wireless/cw1200/debug.h rename to drivers/net/wireless/st/cw1200/debug.h diff --git a/drivers/net/wireless/cw1200/fwio.c b/drivers/net/wireless/st/cw1200/fwio.c similarity index 100% rename from drivers/net/wireless/cw1200/fwio.c rename to drivers/net/wireless/st/cw1200/fwio.c diff --git a/drivers/net/wireless/cw1200/fwio.h b/drivers/net/wireless/st/cw1200/fwio.h similarity index 100% rename from drivers/net/wireless/cw1200/fwio.h rename to drivers/net/wireless/st/cw1200/fwio.h diff --git a/drivers/net/wireless/cw1200/hwbus.h b/drivers/net/wireless/st/cw1200/hwbus.h similarity index 100% rename from drivers/net/wireless/cw1200/hwbus.h rename to drivers/net/wireless/st/cw1200/hwbus.h diff --git a/drivers/net/wireless/cw1200/hwio.c b/drivers/net/wireless/st/cw1200/hwio.c similarity index 100% rename from drivers/net/wireless/cw1200/hwio.c rename to drivers/net/wireless/st/cw1200/hwio.c diff --git a/drivers/net/wireless/cw1200/hwio.h b/drivers/net/wireless/st/cw1200/hwio.h similarity index 100% rename from drivers/net/wireless/cw1200/hwio.h rename to drivers/net/wireless/st/cw1200/hwio.h diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/st/cw1200/main.c similarity index 100% rename from drivers/net/wireless/cw1200/main.c rename to drivers/net/wireless/st/cw1200/main.c diff --git a/drivers/net/wireless/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c similarity index 100% rename from drivers/net/wireless/cw1200/pm.c rename to drivers/net/wireless/st/cw1200/pm.c diff --git a/drivers/net/wireless/cw1200/pm.h b/drivers/net/wireless/st/cw1200/pm.h similarity index 100% rename from drivers/net/wireless/cw1200/pm.h rename to drivers/net/wireless/st/cw1200/pm.h diff --git a/drivers/net/wireless/cw1200/queue.c b/drivers/net/wireless/st/cw1200/queue.c similarity index 100% rename from drivers/net/wireless/cw1200/queue.c rename to drivers/net/wireless/st/cw1200/queue.c diff --git a/drivers/net/wireless/cw1200/queue.h b/drivers/net/wireless/st/cw1200/queue.h similarity index 100% rename from drivers/net/wireless/cw1200/queue.h rename to drivers/net/wireless/st/cw1200/queue.h diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/st/cw1200/scan.c similarity index 100% rename from drivers/net/wireless/cw1200/scan.c rename to drivers/net/wireless/st/cw1200/scan.c diff --git a/drivers/net/wireless/cw1200/scan.h b/drivers/net/wireless/st/cw1200/scan.h similarity index 100% rename from drivers/net/wireless/cw1200/scan.h rename to drivers/net/wireless/st/cw1200/scan.h diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/st/cw1200/sta.c similarity index 100% rename from drivers/net/wireless/cw1200/sta.c rename to drivers/net/wireless/st/cw1200/sta.c diff --git a/drivers/net/wireless/cw1200/sta.h b/drivers/net/wireless/st/cw1200/sta.h similarity index 100% rename from drivers/net/wireless/cw1200/sta.h rename to drivers/net/wireless/st/cw1200/sta.h diff --git a/drivers/net/wireless/cw1200/txrx.c b/drivers/net/wireless/st/cw1200/txrx.c similarity index 100% rename from drivers/net/wireless/cw1200/txrx.c rename to drivers/net/wireless/st/cw1200/txrx.c diff --git a/drivers/net/wireless/cw1200/txrx.h b/drivers/net/wireless/st/cw1200/txrx.h similarity index 100% rename from drivers/net/wireless/cw1200/txrx.h rename to drivers/net/wireless/st/cw1200/txrx.h diff --git a/drivers/net/wireless/cw1200/wsm.c b/drivers/net/wireless/st/cw1200/wsm.c similarity index 100% rename from drivers/net/wireless/cw1200/wsm.c rename to drivers/net/wireless/st/cw1200/wsm.c diff --git a/drivers/net/wireless/cw1200/wsm.h b/drivers/net/wireless/st/cw1200/wsm.h similarity index 100% rename from drivers/net/wireless/cw1200/wsm.h rename to drivers/net/wireless/st/cw1200/wsm.h From 367a1092b555f4372a556ddb53970d25061c74d1 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 20:24:59 +0200 Subject: [PATCH 08/27] ipw2x00: move under intel vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 .../net/wireless/{ => intel}/ipw2x00/Makefile | 0 drivers/net/wireless/{ => intel}/ipw2x00/ipw.h | 0 .../net/wireless/{ => intel}/ipw2x00/ipw2100.c | 0 .../net/wireless/{ => intel}/ipw2x00/ipw2100.h | 0 .../net/wireless/{ => intel}/ipw2x00/ipw2200.c | 0 .../net/wireless/{ => intel}/ipw2x00/ipw2200.h | 0 .../net/wireless/{ => intel}/ipw2x00/libipw.h | 0 .../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%) diff --git a/MAINTAINERS b/MAINTAINERS index 4cbd4641e6fb..b341dabeb579 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5607,7 +5607,7 @@ L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index c1742f228fec..73e3b53caf45 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index d7211a7949e6..52946d8dd31d 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/intel/Kconfig b/drivers/net/wireless/intel/Kconfig new file mode 100644 index 000000000000..3f8eacc4209a --- /dev/null +++ b/drivers/net/wireless/intel/Kconfig @@ -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 diff --git a/drivers/net/wireless/intel/Makefile b/drivers/net/wireless/intel/Makefile new file mode 100644 index 000000000000..8e5dcb2d425e --- /dev/null +++ b/drivers/net/wireless/intel/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_IPW2100) += ipw2x00/ +obj-$(CONFIG_IPW2200) += ipw2x00/ diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/intel/ipw2x00/Kconfig similarity index 100% rename from drivers/net/wireless/ipw2x00/Kconfig rename to drivers/net/wireless/intel/ipw2x00/Kconfig diff --git a/drivers/net/wireless/ipw2x00/Makefile b/drivers/net/wireless/intel/ipw2x00/Makefile similarity index 100% rename from drivers/net/wireless/ipw2x00/Makefile rename to drivers/net/wireless/intel/ipw2x00/Makefile diff --git a/drivers/net/wireless/ipw2x00/ipw.h b/drivers/net/wireless/intel/ipw2x00/ipw.h similarity index 100% rename from drivers/net/wireless/ipw2x00/ipw.h rename to drivers/net/wireless/intel/ipw2x00/ipw.h diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c similarity index 100% rename from drivers/net/wireless/ipw2x00/ipw2100.c rename to drivers/net/wireless/intel/ipw2x00/ipw2100.c diff --git a/drivers/net/wireless/ipw2x00/ipw2100.h b/drivers/net/wireless/intel/ipw2x00/ipw2100.h similarity index 100% rename from drivers/net/wireless/ipw2x00/ipw2100.h rename to drivers/net/wireless/intel/ipw2x00/ipw2100.h diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c similarity index 100% rename from drivers/net/wireless/ipw2x00/ipw2200.c rename to drivers/net/wireless/intel/ipw2x00/ipw2200.c diff --git a/drivers/net/wireless/ipw2x00/ipw2200.h b/drivers/net/wireless/intel/ipw2x00/ipw2200.h similarity index 100% rename from drivers/net/wireless/ipw2x00/ipw2200.h rename to drivers/net/wireless/intel/ipw2x00/ipw2200.h diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/intel/ipw2x00/libipw.h similarity index 100% rename from drivers/net/wireless/ipw2x00/libipw.h rename to drivers/net/wireless/intel/ipw2x00/libipw.h diff --git a/drivers/net/wireless/ipw2x00/libipw_geo.c b/drivers/net/wireless/intel/ipw2x00/libipw_geo.c similarity index 100% rename from drivers/net/wireless/ipw2x00/libipw_geo.c rename to drivers/net/wireless/intel/ipw2x00/libipw_geo.c diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/intel/ipw2x00/libipw_module.c similarity index 100% rename from drivers/net/wireless/ipw2x00/libipw_module.c rename to drivers/net/wireless/intel/ipw2x00/libipw_module.c diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/intel/ipw2x00/libipw_rx.c similarity index 100% rename from drivers/net/wireless/ipw2x00/libipw_rx.c rename to drivers/net/wireless/intel/ipw2x00/libipw_rx.c diff --git a/drivers/net/wireless/ipw2x00/libipw_tx.c b/drivers/net/wireless/intel/ipw2x00/libipw_tx.c similarity index 100% rename from drivers/net/wireless/ipw2x00/libipw_tx.c rename to drivers/net/wireless/intel/ipw2x00/libipw_tx.c diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/intel/ipw2x00/libipw_wx.c similarity index 100% rename from drivers/net/wireless/ipw2x00/libipw_wx.c rename to drivers/net/wireless/intel/ipw2x00/libipw_wx.c From 7ac9a364c1721a863ecc6cc9aba66e10114908db Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 20:37:11 +0200 Subject: [PATCH 09/27] iwlegacy: move under intel directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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}/iwlegacy/3945-debug.c | 0 drivers/net/wireless/{ => intel}/iwlegacy/3945-mac.c | 0 drivers/net/wireless/{ => intel}/iwlegacy/3945-rs.c | 0 drivers/net/wireless/{ => intel}/iwlegacy/3945.c | 0 drivers/net/wireless/{ => intel}/iwlegacy/3945.h | 0 drivers/net/wireless/{ => intel}/iwlegacy/4965-calib.c | 0 drivers/net/wireless/{ => intel}/iwlegacy/4965-debug.c | 0 drivers/net/wireless/{ => intel}/iwlegacy/4965-mac.c | 0 drivers/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 drivers/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 drivers/net/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%) diff --git a/MAINTAINERS b/MAINTAINERS index b341dabeb579..83f9c2ba6962 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5641,7 +5641,7 @@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy) M: Stanislaw Gruszka L: linux-wireless@vger.kernel.org S: Supported -F: drivers/net/wireless/iwlegacy/ +F: drivers/net/wireless/intel/iwlegacy/ INTEL WIRELESS WIFI LINK (iwlwifi) M: Johannes Berg diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 73e3b53caf45..f293831e2878 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 52946d8dd31d..135aa8753f69 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/intel/Kconfig b/drivers/net/wireless/intel/Kconfig index 3f8eacc4209a..0a7cd61e528c 100644 --- a/drivers/net/wireless/intel/Kconfig +++ b/drivers/net/wireless/intel/Kconfig @@ -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 diff --git a/drivers/net/wireless/intel/Makefile b/drivers/net/wireless/intel/Makefile index 8e5dcb2d425e..cec507d3c6bf 100644 --- a/drivers/net/wireless/intel/Makefile +++ b/drivers/net/wireless/intel/Makefile @@ -1,2 +1,4 @@ obj-$(CONFIG_IPW2100) += ipw2x00/ obj-$(CONFIG_IPW2200) += ipw2x00/ + +obj-$(CONFIG_IWLEGACY) += iwlegacy/ diff --git a/drivers/net/wireless/iwlegacy/3945-debug.c b/drivers/net/wireless/intel/iwlegacy/3945-debug.c similarity index 100% rename from drivers/net/wireless/iwlegacy/3945-debug.c rename to drivers/net/wireless/intel/iwlegacy/3945-debug.c diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c similarity index 100% rename from drivers/net/wireless/iwlegacy/3945-mac.c rename to drivers/net/wireless/intel/iwlegacy/3945-mac.c diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/intel/iwlegacy/3945-rs.c similarity index 100% rename from drivers/net/wireless/iwlegacy/3945-rs.c rename to drivers/net/wireless/intel/iwlegacy/3945-rs.c diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/intel/iwlegacy/3945.c similarity index 100% rename from drivers/net/wireless/iwlegacy/3945.c rename to drivers/net/wireless/intel/iwlegacy/3945.c diff --git a/drivers/net/wireless/iwlegacy/3945.h b/drivers/net/wireless/intel/iwlegacy/3945.h similarity index 100% rename from drivers/net/wireless/iwlegacy/3945.h rename to drivers/net/wireless/intel/iwlegacy/3945.h diff --git a/drivers/net/wireless/iwlegacy/4965-calib.c b/drivers/net/wireless/intel/iwlegacy/4965-calib.c similarity index 100% rename from drivers/net/wireless/iwlegacy/4965-calib.c rename to drivers/net/wireless/intel/iwlegacy/4965-calib.c diff --git a/drivers/net/wireless/iwlegacy/4965-debug.c b/drivers/net/wireless/intel/iwlegacy/4965-debug.c similarity index 100% rename from drivers/net/wireless/iwlegacy/4965-debug.c rename to drivers/net/wireless/intel/iwlegacy/4965-debug.c diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c similarity index 100% rename from drivers/net/wireless/iwlegacy/4965-mac.c rename to drivers/net/wireless/intel/iwlegacy/4965-mac.c diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/intel/iwlegacy/4965-rs.c similarity index 100% rename from drivers/net/wireless/iwlegacy/4965-rs.c rename to drivers/net/wireless/intel/iwlegacy/4965-rs.c diff --git a/drivers/net/wireless/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c similarity index 100% rename from drivers/net/wireless/iwlegacy/4965.c rename to drivers/net/wireless/intel/iwlegacy/4965.c diff --git a/drivers/net/wireless/iwlegacy/4965.h b/drivers/net/wireless/intel/iwlegacy/4965.h similarity index 100% rename from drivers/net/wireless/iwlegacy/4965.h rename to drivers/net/wireless/intel/iwlegacy/4965.h diff --git a/drivers/net/wireless/iwlegacy/Kconfig b/drivers/net/wireless/intel/iwlegacy/Kconfig similarity index 100% rename from drivers/net/wireless/iwlegacy/Kconfig rename to drivers/net/wireless/intel/iwlegacy/Kconfig diff --git a/drivers/net/wireless/iwlegacy/Makefile b/drivers/net/wireless/intel/iwlegacy/Makefile similarity index 100% rename from drivers/net/wireless/iwlegacy/Makefile rename to drivers/net/wireless/intel/iwlegacy/Makefile diff --git a/drivers/net/wireless/iwlegacy/commands.h b/drivers/net/wireless/intel/iwlegacy/commands.h similarity index 100% rename from drivers/net/wireless/iwlegacy/commands.h rename to drivers/net/wireless/intel/iwlegacy/commands.h diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c similarity index 100% rename from drivers/net/wireless/iwlegacy/common.c rename to drivers/net/wireless/intel/iwlegacy/common.c diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/intel/iwlegacy/common.h similarity index 100% rename from drivers/net/wireless/iwlegacy/common.h rename to drivers/net/wireless/intel/iwlegacy/common.h diff --git a/drivers/net/wireless/iwlegacy/csr.h b/drivers/net/wireless/intel/iwlegacy/csr.h similarity index 100% rename from drivers/net/wireless/iwlegacy/csr.h rename to drivers/net/wireless/intel/iwlegacy/csr.h diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/intel/iwlegacy/debug.c similarity index 100% rename from drivers/net/wireless/iwlegacy/debug.c rename to drivers/net/wireless/intel/iwlegacy/debug.c diff --git a/drivers/net/wireless/iwlegacy/iwl-spectrum.h b/drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h similarity index 100% rename from drivers/net/wireless/iwlegacy/iwl-spectrum.h rename to drivers/net/wireless/intel/iwlegacy/iwl-spectrum.h diff --git a/drivers/net/wireless/iwlegacy/prph.h b/drivers/net/wireless/intel/iwlegacy/prph.h similarity index 100% rename from drivers/net/wireless/iwlegacy/prph.h rename to drivers/net/wireless/intel/iwlegacy/prph.h From e705c12146aa9c69ca498d4ebb83ba7138f9b41f Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 20:57:38 +0200 Subject: [PATCH 10/27] iwlwifi: move under intel vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 drivers/net/wireless/{ => intel}/iwlwifi/dvm/Makefile | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/commands.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h | 0 drivers/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 drivers/net/wireless/{ => intel}/iwlwifi/dvm/mac80211.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/main.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.c | 0 drivers/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 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rxon.c | 0 drivers/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 drivers/net/wireless/{ => intel}/iwlwifi/dvm/ucode.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-1000.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-2000.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-5000.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-6000.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-7000.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-8000.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-config.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-data.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-msg.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-ucode.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.c | 0 drivers/net/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 drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-error-dump.h | 0 drivers/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 drivers/net/wireless/{ => intel}/iwlwifi/iwl-modparams.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-prph.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/Makefile | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/binding.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/constants.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-power.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-stats.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h | 0 drivers/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 drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c | 0 drivers/net/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 drivers/net/wireless/{ => intel}/iwlwifi/mvm/offloading.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/power.c | 0 drivers/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 drivers/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 drivers/net/wireless/{ => intel}/iwlwifi/mvm/tdls.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/testmode.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.c | 0 drivers/net/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 drivers/net/wireless/{ => intel}/iwlwifi/mvm/utils.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/pcie/drv.c | 0 drivers/net/wireless/{ => intel}/iwlwifi/pcie/internal.h | 0 drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c | 0 drivers/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%) diff --git a/MAINTAINERS b/MAINTAINERS index 83f9c2ba6962..d72be8c88138 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5651,7 +5651,7 @@ L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index f293831e2878..d71efe89970b 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 135aa8753f69..6bcb2925a6ce 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/intel/Kconfig b/drivers/net/wireless/intel/Kconfig index 0a7cd61e528c..5b14f2f64a8a 100644 --- a/drivers/net/wireless/intel/Kconfig +++ b/drivers/net/wireless/intel/Kconfig @@ -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 diff --git a/drivers/net/wireless/intel/Makefile b/drivers/net/wireless/intel/Makefile index cec507d3c6bf..c9cbcc85b569 100644 --- a/drivers/net/wireless/intel/Makefile +++ b/drivers/net/wireless/intel/Makefile @@ -2,3 +2,5 @@ obj-$(CONFIG_IPW2100) += ipw2x00/ obj-$(CONFIG_IPW2200) += ipw2x00/ obj-$(CONFIG_IWLEGACY) += iwlegacy/ + +obj-$(CONFIG_IWLWIFI) += iwlwifi/ diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig similarity index 100% rename from drivers/net/wireless/iwlwifi/Kconfig rename to drivers/net/wireless/intel/iwlwifi/Kconfig diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/intel/iwlwifi/Makefile similarity index 100% rename from drivers/net/wireless/iwlwifi/Makefile rename to drivers/net/wireless/intel/iwlwifi/Makefile diff --git a/drivers/net/wireless/iwlwifi/dvm/Makefile b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/Makefile rename to drivers/net/wireless/intel/iwlwifi/dvm/Makefile diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/intel/iwlwifi/dvm/agn.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/agn.h rename to drivers/net/wireless/intel/iwlwifi/dvm/agn.h diff --git a/drivers/net/wireless/iwlwifi/dvm/calib.c b/drivers/net/wireless/intel/iwlwifi/dvm/calib.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/calib.c rename to drivers/net/wireless/intel/iwlwifi/dvm/calib.c diff --git a/drivers/net/wireless/iwlwifi/dvm/calib.h b/drivers/net/wireless/intel/iwlwifi/dvm/calib.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/calib.h rename to drivers/net/wireless/intel/iwlwifi/dvm/calib.h diff --git a/drivers/net/wireless/iwlwifi/dvm/commands.h b/drivers/net/wireless/intel/iwlwifi/dvm/commands.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/commands.h rename to drivers/net/wireless/intel/iwlwifi/dvm/commands.h diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/debugfs.c rename to drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/dev.h rename to drivers/net/wireless/intel/iwlwifi/dvm/dev.h diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/devices.c rename to drivers/net/wireless/intel/iwlwifi/dvm/devices.c diff --git a/drivers/net/wireless/iwlwifi/dvm/led.c b/drivers/net/wireless/intel/iwlwifi/dvm/led.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/led.c rename to drivers/net/wireless/intel/iwlwifi/dvm/led.c diff --git a/drivers/net/wireless/iwlwifi/dvm/led.h b/drivers/net/wireless/intel/iwlwifi/dvm/led.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/led.h rename to drivers/net/wireless/intel/iwlwifi/dvm/led.h diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/intel/iwlwifi/dvm/lib.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/lib.c rename to drivers/net/wireless/intel/iwlwifi/dvm/lib.c diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/mac80211.c rename to drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/main.c rename to drivers/net/wireless/intel/iwlwifi/dvm/main.c diff --git a/drivers/net/wireless/iwlwifi/dvm/power.c b/drivers/net/wireless/intel/iwlwifi/dvm/power.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/power.c rename to drivers/net/wireless/intel/iwlwifi/dvm/power.c diff --git a/drivers/net/wireless/iwlwifi/dvm/power.h b/drivers/net/wireless/intel/iwlwifi/dvm/power.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/power.h rename to drivers/net/wireless/intel/iwlwifi/dvm/power.h diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.c b/drivers/net/wireless/intel/iwlwifi/dvm/rs.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/rs.c rename to drivers/net/wireless/intel/iwlwifi/dvm/rs.c diff --git a/drivers/net/wireless/iwlwifi/dvm/rs.h b/drivers/net/wireless/intel/iwlwifi/dvm/rs.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/rs.h rename to drivers/net/wireless/intel/iwlwifi/dvm/rs.h diff --git a/drivers/net/wireless/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/rx.c rename to drivers/net/wireless/intel/iwlwifi/dvm/rx.c diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/intel/iwlwifi/dvm/rxon.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/rxon.c rename to drivers/net/wireless/intel/iwlwifi/dvm/rxon.c diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/scan.c rename to drivers/net/wireless/intel/iwlwifi/dvm/scan.c diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/intel/iwlwifi/dvm/sta.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/sta.c rename to drivers/net/wireless/intel/iwlwifi/dvm/sta.c diff --git a/drivers/net/wireless/iwlwifi/dvm/tt.c b/drivers/net/wireless/intel/iwlwifi/dvm/tt.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/tt.c rename to drivers/net/wireless/intel/iwlwifi/dvm/tt.c diff --git a/drivers/net/wireless/iwlwifi/dvm/tt.h b/drivers/net/wireless/intel/iwlwifi/dvm/tt.h similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/tt.h rename to drivers/net/wireless/intel/iwlwifi/dvm/tt.h diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/intel/iwlwifi/dvm/tx.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/tx.c rename to drivers/net/wireless/intel/iwlwifi/dvm/tx.c diff --git a/drivers/net/wireless/iwlwifi/dvm/ucode.c b/drivers/net/wireless/intel/iwlwifi/dvm/ucode.c similarity index 100% rename from drivers/net/wireless/iwlwifi/dvm/ucode.c rename to drivers/net/wireless/intel/iwlwifi/dvm/ucode.c diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/intel/iwlwifi/iwl-1000.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-1000.c rename to drivers/net/wireless/intel/iwlwifi/iwl-1000.c diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/intel/iwlwifi/iwl-2000.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-2000.c rename to drivers/net/wireless/intel/iwlwifi/iwl-2000.c diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/intel/iwlwifi/iwl-5000.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-5000.c rename to drivers/net/wireless/intel/iwlwifi/iwl-5000.c diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-6000.c rename to drivers/net/wireless/intel/iwlwifi/iwl-6000.c diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/intel/iwlwifi/iwl-7000.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-7000.c rename to drivers/net/wireless/intel/iwlwifi/iwl-7000.c diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-8000.c rename to drivers/net/wireless/intel/iwlwifi/iwl-8000.c diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hw.h b/drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-agn-hw.h rename to drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h diff --git a/drivers/net/wireless/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-config.h rename to drivers/net/wireless/intel/iwlwifi/iwl-config.h diff --git a/drivers/net/wireless/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-csr.h rename to drivers/net/wireless/intel/iwlwifi/iwl-csr.h diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.c b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-debug.c rename to drivers/net/wireless/intel/iwlwifi/iwl-debug.c diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-debug.h rename to drivers/net/wireless/intel/iwlwifi/iwl-debug.h diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-data.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace-data.h rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace-io.h rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace-msg.h rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace-ucode.h rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace.c rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-devtrace.h rename to drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-drv.c rename to drivers/net/wireless/intel/iwlwifi/iwl-drv.c diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.h b/drivers/net/wireless/intel/iwlwifi/iwl-drv.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-drv.h rename to drivers/net/wireless/intel/iwlwifi/iwl-drv.h diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-eeprom-read.c rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-eeprom-read.h rename to drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/intel/iwlwifi/iwl-fh.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-fh.h rename to drivers/net/wireless/intel/iwlwifi/iwl-fh.h diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/intel/iwlwifi/iwl-fw-error-dump.h 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 diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-fw-file.h rename to drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/intel/iwlwifi/iwl-fw.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-fw.h rename to drivers/net/wireless/intel/iwlwifi/iwl-fw.h diff --git a/drivers/net/wireless/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-io.c rename to drivers/net/wireless/intel/iwlwifi/iwl-io.c diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/intel/iwlwifi/iwl-io.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-io.h rename to drivers/net/wireless/intel/iwlwifi/iwl-io.h diff --git a/drivers/net/wireless/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-modparams.h rename to drivers/net/wireless/intel/iwlwifi/iwl-modparams.h diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-notif-wait.c rename to drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.h b/drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-notif-wait.h rename to drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-nvm-parse.c rename to drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-nvm-parse.h rename to drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-op-mode.h rename to drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.c b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-phy-db.c rename to drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c diff --git a/drivers/net/wireless/iwlwifi/iwl-phy-db.h b/drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-phy-db.h rename to drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h diff --git a/drivers/net/wireless/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-prph.h rename to drivers/net/wireless/intel/iwlwifi/iwl-prph.h diff --git a/drivers/net/wireless/iwlwifi/iwl-scd.h b/drivers/net/wireless/intel/iwlwifi/iwl-scd.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-scd.h rename to drivers/net/wireless/intel/iwlwifi/iwl-scd.h diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-trans.c rename to drivers/net/wireless/intel/iwlwifi/iwl-trans.c diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h similarity index 100% rename from drivers/net/wireless/iwlwifi/iwl-trans.h rename to drivers/net/wireless/intel/iwlwifi/iwl-trans.h diff --git a/drivers/net/wireless/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/Makefile rename to drivers/net/wireless/intel/iwlwifi/mvm/Makefile diff --git a/drivers/net/wireless/iwlwifi/mvm/binding.c b/drivers/net/wireless/intel/iwlwifi/mvm/binding.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/binding.c rename to drivers/net/wireless/intel/iwlwifi/mvm/binding.c diff --git a/drivers/net/wireless/iwlwifi/mvm/coex.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/coex.c rename to drivers/net/wireless/intel/iwlwifi/mvm/coex.c diff --git a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/coex_legacy.c rename to drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c diff --git a/drivers/net/wireless/iwlwifi/mvm/constants.h b/drivers/net/wireless/intel/iwlwifi/mvm/constants.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/constants.h rename to drivers/net/wireless/intel/iwlwifi/mvm/constants.h diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/d3.c rename to drivers/net/wireless/intel/iwlwifi/mvm/d3.c diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c rename to drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/debugfs.c rename to drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c diff --git a/drivers/net/wireless/iwlwifi/mvm/debugfs.h b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/debugfs.h rename to drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-coex.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-power.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-power.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-stats.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-tof.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tof.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h 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 diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/fw-api.h rename to drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h diff --git a/drivers/net/wireless/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/fw.c rename to drivers/net/wireless/intel/iwlwifi/mvm/fw.c diff --git a/drivers/net/wireless/iwlwifi/mvm/led.c b/drivers/net/wireless/intel/iwlwifi/mvm/led.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/led.c rename to drivers/net/wireless/intel/iwlwifi/mvm/led.c diff --git a/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c rename to drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/mac80211.c rename to drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/mvm.h rename to drivers/net/wireless/intel/iwlwifi/mvm/mvm.h diff --git a/drivers/net/wireless/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/nvm.c rename to drivers/net/wireless/intel/iwlwifi/mvm/nvm.c diff --git a/drivers/net/wireless/iwlwifi/mvm/offloading.c b/drivers/net/wireless/intel/iwlwifi/mvm/offloading.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/offloading.c rename to drivers/net/wireless/intel/iwlwifi/mvm/offloading.c diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/ops.c rename to drivers/net/wireless/intel/iwlwifi/mvm/ops.c diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c rename to drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/intel/iwlwifi/mvm/power.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/power.c rename to drivers/net/wireless/intel/iwlwifi/mvm/power.c diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/intel/iwlwifi/mvm/quota.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/quota.c rename to drivers/net/wireless/intel/iwlwifi/mvm/quota.c diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/rs.c rename to drivers/net/wireless/intel/iwlwifi/mvm/rs.c diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.h b/drivers/net/wireless/intel/iwlwifi/mvm/rs.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/rs.h rename to drivers/net/wireless/intel/iwlwifi/mvm/rs.h diff --git a/drivers/net/wireless/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/rx.c rename to drivers/net/wireless/intel/iwlwifi/mvm/rx.c diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/scan.c rename to drivers/net/wireless/intel/iwlwifi/mvm/scan.c diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/intel/iwlwifi/mvm/sf.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/sf.c rename to drivers/net/wireless/intel/iwlwifi/mvm/sf.c diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/sta.c rename to drivers/net/wireless/intel/iwlwifi/mvm/sta.c diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/sta.h rename to drivers/net/wireless/intel/iwlwifi/mvm/sta.h diff --git a/drivers/net/wireless/iwlwifi/mvm/tdls.c b/drivers/net/wireless/intel/iwlwifi/mvm/tdls.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/tdls.c rename to drivers/net/wireless/intel/iwlwifi/mvm/tdls.c diff --git a/drivers/net/wireless/iwlwifi/mvm/testmode.h b/drivers/net/wireless/intel/iwlwifi/mvm/testmode.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/testmode.h rename to drivers/net/wireless/intel/iwlwifi/mvm/testmode.h diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/time-event.c rename to drivers/net/wireless/intel/iwlwifi/mvm/time-event.c diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.h b/drivers/net/wireless/intel/iwlwifi/mvm/time-event.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/time-event.h rename to drivers/net/wireless/intel/iwlwifi/mvm/time-event.h diff --git a/drivers/net/wireless/iwlwifi/mvm/tof.c b/drivers/net/wireless/intel/iwlwifi/mvm/tof.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/tof.c rename to drivers/net/wireless/intel/iwlwifi/mvm/tof.c diff --git a/drivers/net/wireless/iwlwifi/mvm/tof.h b/drivers/net/wireless/intel/iwlwifi/mvm/tof.h similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/tof.h rename to drivers/net/wireless/intel/iwlwifi/mvm/tof.h diff --git a/drivers/net/wireless/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/tt.c rename to drivers/net/wireless/intel/iwlwifi/mvm/tt.c diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/tx.c rename to drivers/net/wireless/intel/iwlwifi/mvm/tx.c diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c similarity index 100% rename from drivers/net/wireless/iwlwifi/mvm/utils.c rename to drivers/net/wireless/intel/iwlwifi/mvm/utils.c diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c similarity index 100% rename from drivers/net/wireless/iwlwifi/pcie/drv.c rename to drivers/net/wireless/intel/iwlwifi/pcie/drv.c diff --git a/drivers/net/wireless/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h similarity index 100% rename from drivers/net/wireless/iwlwifi/pcie/internal.h rename to drivers/net/wireless/intel/iwlwifi/pcie/internal.h diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c similarity index 100% rename from drivers/net/wireless/iwlwifi/pcie/rx.c rename to drivers/net/wireless/intel/iwlwifi/pcie/rx.c diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c similarity index 100% rename from drivers/net/wireless/iwlwifi/pcie/trans.c rename to drivers/net/wireless/intel/iwlwifi/pcie/trans.c diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c similarity index 100% rename from drivers/net/wireless/iwlwifi/pcie/tx.c rename to drivers/net/wireless/intel/iwlwifi/pcie/tx.c From f988d64010ec058a206dce083b5c791ce09caa48 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 21:07:19 +0200 Subject: [PATCH 11/27] libertas: move under marvell vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 .../net/wireless/{ => marvell}/libertas/README | 0 .../net/wireless/{ => marvell}/libertas/cfg.c | 0 .../net/wireless/{ => marvell}/libertas/cfg.h | 0 .../net/wireless/{ => marvell}/libertas/cmd.c | 0 .../net/wireless/{ => marvell}/libertas/cmd.h | 0 .../wireless/{ => marvell}/libertas/cmdresp.c | 0 .../wireless/{ => marvell}/libertas/debugfs.c | 0 .../wireless/{ => marvell}/libertas/debugfs.h | 0 .../net/wireless/{ => marvell}/libertas/decl.h | 0 .../net/wireless/{ => marvell}/libertas/defs.h | 0 .../net/wireless/{ => marvell}/libertas/dev.h | 0 .../wireless/{ => marvell}/libertas/ethtool.c | 0 .../wireless/{ => marvell}/libertas/firmware.c | 0 .../net/wireless/{ => marvell}/libertas/host.h | 0 .../net/wireless/{ => marvell}/libertas/if_cs.c | 0 .../wireless/{ => marvell}/libertas/if_sdio.c | 0 .../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 .../net/wireless/{ => marvell}/libertas/main.c | 0 .../net/wireless/{ => marvell}/libertas/mesh.c | 0 .../net/wireless/{ => marvell}/libertas/mesh.h | 0 .../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%) diff --git a/MAINTAINERS b/MAINTAINERS index d72be8c88138..75ff7434db0e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6708,7 +6708,7 @@ F: drivers/net/ethernet/marvell/sk* MARVELL LIBERTAS WIRELESS DRIVER L: libertas-dev@lists.infradead.org S: Orphan -F: drivers/net/wireless/libertas/ +F: drivers/net/wireless/marvell/libertas/ MARVELL MV643XX ETHERNET DRIVER M: Sebastian Hesselbarth diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index d71efe89970b..b11a2d364200 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 6bcb2925a6ce..a974a6edb4b6 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig new file mode 100644 index 000000000000..7842096bea53 --- /dev/null +++ b/drivers/net/wireless/marvell/Kconfig @@ -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 diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile new file mode 100644 index 000000000000..6f7ac46ded33 --- /dev/null +++ b/drivers/net/wireless/marvell/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_LIBERTAS) += libertas/ diff --git a/drivers/net/wireless/libertas/Kconfig b/drivers/net/wireless/marvell/libertas/Kconfig similarity index 100% rename from drivers/net/wireless/libertas/Kconfig rename to drivers/net/wireless/marvell/libertas/Kconfig diff --git a/drivers/net/wireless/libertas/LICENSE b/drivers/net/wireless/marvell/libertas/LICENSE similarity index 100% rename from drivers/net/wireless/libertas/LICENSE rename to drivers/net/wireless/marvell/libertas/LICENSE diff --git a/drivers/net/wireless/libertas/Makefile b/drivers/net/wireless/marvell/libertas/Makefile similarity index 100% rename from drivers/net/wireless/libertas/Makefile rename to drivers/net/wireless/marvell/libertas/Makefile diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/marvell/libertas/README similarity index 100% rename from drivers/net/wireless/libertas/README rename to drivers/net/wireless/marvell/libertas/README diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c similarity index 100% rename from drivers/net/wireless/libertas/cfg.c rename to drivers/net/wireless/marvell/libertas/cfg.c diff --git a/drivers/net/wireless/libertas/cfg.h b/drivers/net/wireless/marvell/libertas/cfg.h similarity index 100% rename from drivers/net/wireless/libertas/cfg.h rename to drivers/net/wireless/marvell/libertas/cfg.h diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/marvell/libertas/cmd.c similarity index 100% rename from drivers/net/wireless/libertas/cmd.c rename to drivers/net/wireless/marvell/libertas/cmd.c diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/marvell/libertas/cmd.h similarity index 100% rename from drivers/net/wireless/libertas/cmd.h rename to drivers/net/wireless/marvell/libertas/cmd.h diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/marvell/libertas/cmdresp.c similarity index 100% rename from drivers/net/wireless/libertas/cmdresp.c rename to drivers/net/wireless/marvell/libertas/cmdresp.c diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/marvell/libertas/debugfs.c similarity index 100% rename from drivers/net/wireless/libertas/debugfs.c rename to drivers/net/wireless/marvell/libertas/debugfs.c diff --git a/drivers/net/wireless/libertas/debugfs.h b/drivers/net/wireless/marvell/libertas/debugfs.h similarity index 100% rename from drivers/net/wireless/libertas/debugfs.h rename to drivers/net/wireless/marvell/libertas/debugfs.h diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/marvell/libertas/decl.h similarity index 100% rename from drivers/net/wireless/libertas/decl.h rename to drivers/net/wireless/marvell/libertas/decl.h diff --git a/drivers/net/wireless/libertas/defs.h b/drivers/net/wireless/marvell/libertas/defs.h similarity index 100% rename from drivers/net/wireless/libertas/defs.h rename to drivers/net/wireless/marvell/libertas/defs.h diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/marvell/libertas/dev.h similarity index 100% rename from drivers/net/wireless/libertas/dev.h rename to drivers/net/wireless/marvell/libertas/dev.h diff --git a/drivers/net/wireless/libertas/ethtool.c b/drivers/net/wireless/marvell/libertas/ethtool.c similarity index 100% rename from drivers/net/wireless/libertas/ethtool.c rename to drivers/net/wireless/marvell/libertas/ethtool.c diff --git a/drivers/net/wireless/libertas/firmware.c b/drivers/net/wireless/marvell/libertas/firmware.c similarity index 100% rename from drivers/net/wireless/libertas/firmware.c rename to drivers/net/wireless/marvell/libertas/firmware.c diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/marvell/libertas/host.h similarity index 100% rename from drivers/net/wireless/libertas/host.h rename to drivers/net/wireless/marvell/libertas/host.h diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/marvell/libertas/if_cs.c similarity index 100% rename from drivers/net/wireless/libertas/if_cs.c rename to drivers/net/wireless/marvell/libertas/if_cs.c diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c similarity index 100% rename from drivers/net/wireless/libertas/if_sdio.c rename to drivers/net/wireless/marvell/libertas/if_sdio.c diff --git a/drivers/net/wireless/libertas/if_sdio.h b/drivers/net/wireless/marvell/libertas/if_sdio.h similarity index 100% rename from drivers/net/wireless/libertas/if_sdio.h rename to drivers/net/wireless/marvell/libertas/if_sdio.h diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/marvell/libertas/if_spi.c similarity index 100% rename from drivers/net/wireless/libertas/if_spi.c rename to drivers/net/wireless/marvell/libertas/if_spi.c diff --git a/drivers/net/wireless/libertas/if_spi.h b/drivers/net/wireless/marvell/libertas/if_spi.h similarity index 100% rename from drivers/net/wireless/libertas/if_spi.h rename to drivers/net/wireless/marvell/libertas/if_spi.h diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c similarity index 100% rename from drivers/net/wireless/libertas/if_usb.c rename to drivers/net/wireless/marvell/libertas/if_usb.c diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/marvell/libertas/if_usb.h similarity index 100% rename from drivers/net/wireless/libertas/if_usb.h rename to drivers/net/wireless/marvell/libertas/if_usb.h diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/marvell/libertas/main.c similarity index 100% rename from drivers/net/wireless/libertas/main.c rename to drivers/net/wireless/marvell/libertas/main.c diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c similarity index 100% rename from drivers/net/wireless/libertas/mesh.c rename to drivers/net/wireless/marvell/libertas/mesh.c diff --git a/drivers/net/wireless/libertas/mesh.h b/drivers/net/wireless/marvell/libertas/mesh.h similarity index 100% rename from drivers/net/wireless/libertas/mesh.h rename to drivers/net/wireless/marvell/libertas/mesh.h diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/marvell/libertas/radiotap.h similarity index 100% rename from drivers/net/wireless/libertas/radiotap.h rename to drivers/net/wireless/marvell/libertas/radiotap.h diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/marvell/libertas/rx.c similarity index 100% rename from drivers/net/wireless/libertas/rx.c rename to drivers/net/wireless/marvell/libertas/rx.c diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/marvell/libertas/tx.c similarity index 100% rename from drivers/net/wireless/libertas/tx.c rename to drivers/net/wireless/marvell/libertas/tx.c diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/marvell/libertas/types.h similarity index 100% rename from drivers/net/wireless/libertas/types.h rename to drivers/net/wireless/marvell/libertas/types.h From dd3f92dea849d96272642579003754df9367c160 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 21:11:21 +0200 Subject: [PATCH 12/27] libertas_tf: move under marvell vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- drivers/net/wireless/Kconfig | 19 ------------------- drivers/net/wireless/Makefile | 2 -- drivers/net/wireless/marvell/Kconfig | 1 + drivers/net/wireless/marvell/Makefile | 2 ++ .../net/wireless/marvell/libertas_tf/Kconfig | 18 ++++++++++++++++++ .../{ => marvell}/libertas_tf/Makefile | 0 .../wireless/{ => marvell}/libertas_tf/cmd.c | 0 .../{ => marvell}/libertas_tf/deb_defs.h | 0 .../{ => marvell}/libertas_tf/if_usb.c | 0 .../{ => marvell}/libertas_tf/if_usb.h | 0 .../{ => marvell}/libertas_tf/libertas_tf.h | 0 .../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%) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index b11a2d364200..25f52b32d725 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index a974a6edb4b6..72b167742ac7 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig index 7842096bea53..97ec8f35745e 100644 --- a/drivers/net/wireless/marvell/Kconfig +++ b/drivers/net/wireless/marvell/Kconfig @@ -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 diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile index 6f7ac46ded33..8f5eb423b71a 100644 --- a/drivers/net/wireless/marvell/Makefile +++ b/drivers/net/wireless/marvell/Makefile @@ -1 +1,3 @@ obj-$(CONFIG_LIBERTAS) += libertas/ + +obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ diff --git a/drivers/net/wireless/marvell/libertas_tf/Kconfig b/drivers/net/wireless/marvell/libertas_tf/Kconfig new file mode 100644 index 000000000000..b5557af90048 --- /dev/null +++ b/drivers/net/wireless/marvell/libertas_tf/Kconfig @@ -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. diff --git a/drivers/net/wireless/libertas_tf/Makefile b/drivers/net/wireless/marvell/libertas_tf/Makefile similarity index 100% rename from drivers/net/wireless/libertas_tf/Makefile rename to drivers/net/wireless/marvell/libertas_tf/Makefile diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/marvell/libertas_tf/cmd.c similarity index 100% rename from drivers/net/wireless/libertas_tf/cmd.c rename to drivers/net/wireless/marvell/libertas_tf/cmd.c diff --git a/drivers/net/wireless/libertas_tf/deb_defs.h b/drivers/net/wireless/marvell/libertas_tf/deb_defs.h similarity index 100% rename from drivers/net/wireless/libertas_tf/deb_defs.h rename to drivers/net/wireless/marvell/libertas_tf/deb_defs.h diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c similarity index 100% rename from drivers/net/wireless/libertas_tf/if_usb.c rename to drivers/net/wireless/marvell/libertas_tf/if_usb.c diff --git a/drivers/net/wireless/libertas_tf/if_usb.h b/drivers/net/wireless/marvell/libertas_tf/if_usb.h similarity index 100% rename from drivers/net/wireless/libertas_tf/if_usb.h rename to drivers/net/wireless/marvell/libertas_tf/if_usb.h diff --git a/drivers/net/wireless/libertas_tf/libertas_tf.h b/drivers/net/wireless/marvell/libertas_tf/libertas_tf.h similarity index 100% rename from drivers/net/wireless/libertas_tf/libertas_tf.h rename to drivers/net/wireless/marvell/libertas_tf/libertas_tf.h diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/marvell/libertas_tf/main.c similarity index 100% rename from drivers/net/wireless/libertas_tf/main.c rename to drivers/net/wireless/marvell/libertas_tf/main.c From 277b024e5e3d4af4c219c0b9bd541ca4398e0b69 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 21:14:51 +0200 Subject: [PATCH 13/27] mwifiex: move under marvell vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.h | 0 drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.h | 0 drivers/net/wireless/{ => marvell}/mwifiex/Kconfig | 0 drivers/net/wireless/{ => marvell}/mwifiex/Makefile | 0 drivers/net/wireless/{ => marvell}/mwifiex/README | 0 drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.h | 0 drivers/net/wireless/{ => marvell}/mwifiex/cfp.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/cmdevt.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/debugfs.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/decl.h | 0 drivers/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 drivers/net/wireless/{ => marvell}/mwifiex/sta_cmd.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/sta_cmdresp.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/sta_event.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/sta_ioctl.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/sta_rx.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/sta_tx.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/tdls.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/txrx.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/uap_cmd.c | 0 drivers/net/wireless/{ => marvell}/mwifiex/uap_event.c | 0 drivers/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%) diff --git a/MAINTAINERS b/MAINTAINERS index 75ff7434db0e..5b889f6972c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6728,7 +6728,7 @@ M: Amitkumar Karwar M: Nishant Sarmukadam L: linux-wireless@vger.kernel.org S: Maintained -F: drivers/net/wireless/mwifiex/ +F: drivers/net/wireless/marvell/mwifiex/ MARVELL MWL8K WIRELESS DRIVER M: Lennert Buytenhek diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 25f52b32d725..465665237308 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 72b167742ac7..7a95b58a5c76 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig index 97ec8f35745e..bbdbac9a2a45 100644 --- a/drivers/net/wireless/marvell/Kconfig +++ b/drivers/net/wireless/marvell/Kconfig @@ -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 diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile index 8f5eb423b71a..f4ab48aaff3c 100644 --- a/drivers/net/wireless/marvell/Makefile +++ b/drivers/net/wireless/marvell/Makefile @@ -1,3 +1,4 @@ obj-$(CONFIG_LIBERTAS) += libertas/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ +obj-$(CONFIG_MWIFIEX) += mwifiex/ diff --git a/drivers/net/wireless/mwifiex/11ac.c b/drivers/net/wireless/marvell/mwifiex/11ac.c similarity index 100% rename from drivers/net/wireless/mwifiex/11ac.c rename to drivers/net/wireless/marvell/mwifiex/11ac.c diff --git a/drivers/net/wireless/mwifiex/11ac.h b/drivers/net/wireless/marvell/mwifiex/11ac.h similarity index 100% rename from drivers/net/wireless/mwifiex/11ac.h rename to drivers/net/wireless/marvell/mwifiex/11ac.h diff --git a/drivers/net/wireless/mwifiex/11h.c b/drivers/net/wireless/marvell/mwifiex/11h.c similarity index 100% rename from drivers/net/wireless/mwifiex/11h.c rename to drivers/net/wireless/marvell/mwifiex/11h.c diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c similarity index 100% rename from drivers/net/wireless/mwifiex/11n.c rename to drivers/net/wireless/marvell/mwifiex/11n.c diff --git a/drivers/net/wireless/mwifiex/11n.h b/drivers/net/wireless/marvell/mwifiex/11n.h similarity index 100% rename from drivers/net/wireless/mwifiex/11n.h rename to drivers/net/wireless/marvell/mwifiex/11n.h diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c similarity index 100% rename from drivers/net/wireless/mwifiex/11n_aggr.c rename to drivers/net/wireless/marvell/mwifiex/11n_aggr.c diff --git a/drivers/net/wireless/mwifiex/11n_aggr.h b/drivers/net/wireless/marvell/mwifiex/11n_aggr.h similarity index 100% rename from drivers/net/wireless/mwifiex/11n_aggr.h rename to drivers/net/wireless/marvell/mwifiex/11n_aggr.h diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c similarity index 100% rename from drivers/net/wireless/mwifiex/11n_rxreorder.c rename to drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.h b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h similarity index 100% rename from drivers/net/wireless/mwifiex/11n_rxreorder.h rename to drivers/net/wireless/marvell/mwifiex/11n_rxreorder.h diff --git a/drivers/net/wireless/mwifiex/Kconfig b/drivers/net/wireless/marvell/mwifiex/Kconfig similarity index 100% rename from drivers/net/wireless/mwifiex/Kconfig rename to drivers/net/wireless/marvell/mwifiex/Kconfig diff --git a/drivers/net/wireless/mwifiex/Makefile b/drivers/net/wireless/marvell/mwifiex/Makefile similarity index 100% rename from drivers/net/wireless/mwifiex/Makefile rename to drivers/net/wireless/marvell/mwifiex/Makefile diff --git a/drivers/net/wireless/mwifiex/README b/drivers/net/wireless/marvell/mwifiex/README similarity index 100% rename from drivers/net/wireless/mwifiex/README rename to drivers/net/wireless/marvell/mwifiex/README diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c similarity index 100% rename from drivers/net/wireless/mwifiex/cfg80211.c rename to drivers/net/wireless/marvell/mwifiex/cfg80211.c diff --git a/drivers/net/wireless/mwifiex/cfg80211.h b/drivers/net/wireless/marvell/mwifiex/cfg80211.h similarity index 100% rename from drivers/net/wireless/mwifiex/cfg80211.h rename to drivers/net/wireless/marvell/mwifiex/cfg80211.h diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/marvell/mwifiex/cfp.c similarity index 100% rename from drivers/net/wireless/mwifiex/cfp.c rename to drivers/net/wireless/marvell/mwifiex/cfp.c diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c similarity index 100% rename from drivers/net/wireless/mwifiex/cmdevt.c rename to drivers/net/wireless/marvell/mwifiex/cmdevt.c diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/marvell/mwifiex/debugfs.c similarity index 100% rename from drivers/net/wireless/mwifiex/debugfs.c rename to drivers/net/wireless/marvell/mwifiex/debugfs.c diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/marvell/mwifiex/decl.h similarity index 100% rename from drivers/net/wireless/mwifiex/decl.h rename to drivers/net/wireless/marvell/mwifiex/decl.h diff --git a/drivers/net/wireless/mwifiex/ethtool.c b/drivers/net/wireless/marvell/mwifiex/ethtool.c similarity index 100% rename from drivers/net/wireless/mwifiex/ethtool.c rename to drivers/net/wireless/marvell/mwifiex/ethtool.c diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h similarity index 100% rename from drivers/net/wireless/mwifiex/fw.h rename to drivers/net/wireless/marvell/mwifiex/fw.h diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c similarity index 100% rename from drivers/net/wireless/mwifiex/ie.c rename to drivers/net/wireless/marvell/mwifiex/ie.c diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c similarity index 100% rename from drivers/net/wireless/mwifiex/init.c rename to drivers/net/wireless/marvell/mwifiex/init.c diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h similarity index 100% rename from drivers/net/wireless/mwifiex/ioctl.h rename to drivers/net/wireless/marvell/mwifiex/ioctl.h diff --git a/drivers/net/wireless/mwifiex/join.c b/drivers/net/wireless/marvell/mwifiex/join.c similarity index 100% rename from drivers/net/wireless/mwifiex/join.c rename to drivers/net/wireless/marvell/mwifiex/join.c diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c similarity index 100% rename from drivers/net/wireless/mwifiex/main.c rename to drivers/net/wireless/marvell/mwifiex/main.c diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h similarity index 100% rename from drivers/net/wireless/mwifiex/main.h rename to drivers/net/wireless/marvell/mwifiex/main.h diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c similarity index 100% rename from drivers/net/wireless/mwifiex/pcie.c rename to drivers/net/wireless/marvell/mwifiex/pcie.c diff --git a/drivers/net/wireless/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h similarity index 100% rename from drivers/net/wireless/mwifiex/pcie.h rename to drivers/net/wireless/marvell/mwifiex/pcie.h diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c similarity index 100% rename from drivers/net/wireless/mwifiex/scan.c rename to drivers/net/wireless/marvell/mwifiex/scan.c diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c similarity index 100% rename from drivers/net/wireless/mwifiex/sdio.c rename to drivers/net/wireless/marvell/mwifiex/sdio.c diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h similarity index 100% rename from drivers/net/wireless/mwifiex/sdio.h rename to drivers/net/wireless/marvell/mwifiex/sdio.h diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c similarity index 100% rename from drivers/net/wireless/mwifiex/sta_cmd.c rename to drivers/net/wireless/marvell/mwifiex/sta_cmd.c diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c similarity index 100% rename from drivers/net/wireless/mwifiex/sta_cmdresp.c rename to drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/marvell/mwifiex/sta_event.c similarity index 100% rename from drivers/net/wireless/mwifiex/sta_event.c rename to drivers/net/wireless/marvell/mwifiex/sta_event.c diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c similarity index 100% rename from drivers/net/wireless/mwifiex/sta_ioctl.c rename to drivers/net/wireless/marvell/mwifiex/sta_ioctl.c diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/marvell/mwifiex/sta_rx.c similarity index 100% rename from drivers/net/wireless/mwifiex/sta_rx.c rename to drivers/net/wireless/marvell/mwifiex/sta_rx.c diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/marvell/mwifiex/sta_tx.c similarity index 100% rename from drivers/net/wireless/mwifiex/sta_tx.c rename to drivers/net/wireless/marvell/mwifiex/sta_tx.c diff --git a/drivers/net/wireless/mwifiex/tdls.c b/drivers/net/wireless/marvell/mwifiex/tdls.c similarity index 100% rename from drivers/net/wireless/mwifiex/tdls.c rename to drivers/net/wireless/marvell/mwifiex/tdls.c diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/marvell/mwifiex/txrx.c similarity index 100% rename from drivers/net/wireless/mwifiex/txrx.c rename to drivers/net/wireless/marvell/mwifiex/txrx.c diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c similarity index 100% rename from drivers/net/wireless/mwifiex/uap_cmd.c rename to drivers/net/wireless/marvell/mwifiex/uap_cmd.c diff --git a/drivers/net/wireless/mwifiex/uap_event.c b/drivers/net/wireless/marvell/mwifiex/uap_event.c similarity index 100% rename from drivers/net/wireless/mwifiex/uap_event.c rename to drivers/net/wireless/marvell/mwifiex/uap_event.c diff --git a/drivers/net/wireless/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c similarity index 100% rename from drivers/net/wireless/mwifiex/uap_txrx.c rename to drivers/net/wireless/marvell/mwifiex/uap_txrx.c diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c similarity index 100% rename from drivers/net/wireless/mwifiex/usb.c rename to drivers/net/wireless/marvell/mwifiex/usb.c diff --git a/drivers/net/wireless/mwifiex/usb.h b/drivers/net/wireless/marvell/mwifiex/usb.h similarity index 100% rename from drivers/net/wireless/mwifiex/usb.h rename to drivers/net/wireless/marvell/mwifiex/usb.h diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c similarity index 100% rename from drivers/net/wireless/mwifiex/util.c rename to drivers/net/wireless/marvell/mwifiex/util.c diff --git a/drivers/net/wireless/mwifiex/util.h b/drivers/net/wireless/marvell/mwifiex/util.h similarity index 100% rename from drivers/net/wireless/mwifiex/util.h rename to drivers/net/wireless/marvell/mwifiex/util.h diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c similarity index 100% rename from drivers/net/wireless/mwifiex/wmm.c rename to drivers/net/wireless/marvell/mwifiex/wmm.c diff --git a/drivers/net/wireless/mwifiex/wmm.h b/drivers/net/wireless/marvell/mwifiex/wmm.h similarity index 100% rename from drivers/net/wireless/mwifiex/wmm.h rename to drivers/net/wireless/marvell/mwifiex/wmm.h From de60f1dc23f65c308636036cbb14e0d3ada36f27 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Nov 2015 21:18:12 +0200 Subject: [PATCH 14/27] mwl8k: move under marvell vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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%) diff --git a/MAINTAINERS b/MAINTAINERS index 5b889f6972c0..e622877aaab4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6734,7 +6734,7 @@ MARVELL MWL8K WIRELESS DRIVER M: Lennert Buytenhek L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 465665237308..315982a5ee73 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 7a95b58a5c76..9498753f596b 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/marvell/Kconfig b/drivers/net/wireless/marvell/Kconfig index bbdbac9a2a45..4938c7ec0009 100644 --- a/drivers/net/wireless/marvell/Kconfig +++ b/drivers/net/wireless/marvell/Kconfig @@ -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 diff --git a/drivers/net/wireless/marvell/Makefile b/drivers/net/wireless/marvell/Makefile index f4ab48aaff3c..1b0a7d2bc8e6 100644 --- a/drivers/net/wireless/marvell/Makefile +++ b/drivers/net/wireless/marvell/Makefile @@ -2,3 +2,5 @@ obj-$(CONFIG_LIBERTAS) += libertas/ obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/ obj-$(CONFIG_MWIFIEX) += mwifiex/ + +obj-$(CONFIG_MWL8K) += mwl8k.o diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/marvell/mwl8k.c similarity index 100% rename from drivers/net/wireless/mwl8k.c rename to drivers/net/wireless/marvell/mwl8k.c From ed0ad06f5c8e5b8fc3c6d7c0e3d2dc546638c18c Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 07:39:37 +0200 Subject: [PATCH 15/27] zd1201: move under zydas vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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%) diff --git a/MAINTAINERS b/MAINTAINERS index e622877aaab4..ec098370ef3d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11252,7 +11252,7 @@ USB ZD1201 DRIVER L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 315982a5ee73..35155e2dc8bf 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 9498753f596b..4ee6d6d08743 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/zydas/Kconfig b/drivers/net/wireless/zydas/Kconfig new file mode 100644 index 000000000000..6140dfa04fed --- /dev/null +++ b/drivers/net/wireless/zydas/Kconfig @@ -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 diff --git a/drivers/net/wireless/zydas/Makefile b/drivers/net/wireless/zydas/Makefile new file mode 100644 index 000000000000..37179ef890ea --- /dev/null +++ b/drivers/net/wireless/zydas/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_USB_ZD1201) += zd1201.o diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zydas/zd1201.c similarity index 100% rename from drivers/net/wireless/zd1201.c rename to drivers/net/wireless/zydas/zd1201.c diff --git a/drivers/net/wireless/zd1201.h b/drivers/net/wireless/zydas/zd1201.h similarity index 100% rename from drivers/net/wireless/zd1201.h rename to drivers/net/wireless/zydas/zd1201.h From 6948300c79dba2b6c7b54af43d1924f51e47e017 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 09:27:32 +0200 Subject: [PATCH 16/27] zd1211rw: move under zydas vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.c | 0 drivers/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 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c | 0 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c | 0 drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c | 0 drivers/net/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%) diff --git a/MAINTAINERS b/MAINTAINERS index ec098370ef3d..f2e78420488c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11883,7 +11883,7 @@ W: http://zd1211.ath.cx/wiki/DriverRewrite L: linux-wireless@vger.kernel.org L: zd1211-devs@lists.sourceforge.net (subscribers-only) S: Maintained -F: drivers/net/wireless/zd1211rw/ +F: drivers/net/wireless/zydas/zd1211rw/ ZPOOL COMPRESSED PAGE STORAGE API M: Dan Streetman diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 35155e2dc8bf..e86dcdd5cfcb 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 4ee6d6d08743..8f54adde831e 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/zydas/Kconfig b/drivers/net/wireless/zydas/Kconfig index 6140dfa04fed..a58c0f65e376 100644 --- a/drivers/net/wireless/zydas/Kconfig +++ b/drivers/net/wireless/zydas/Kconfig @@ -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 diff --git a/drivers/net/wireless/zydas/Makefile b/drivers/net/wireless/zydas/Makefile index 37179ef890ea..679fbbf3a6cd 100644 --- a/drivers/net/wireless/zydas/Makefile +++ b/drivers/net/wireless/zydas/Makefile @@ -1 +1,3 @@ +obj-$(CONFIG_ZD1211RW) += zd1211rw/ + obj-$(CONFIG_USB_ZD1201) += zd1201.o diff --git a/drivers/net/wireless/zd1211rw/Kconfig b/drivers/net/wireless/zydas/zd1211rw/Kconfig similarity index 100% rename from drivers/net/wireless/zd1211rw/Kconfig rename to drivers/net/wireless/zydas/zd1211rw/Kconfig diff --git a/drivers/net/wireless/zd1211rw/Makefile b/drivers/net/wireless/zydas/zd1211rw/Makefile similarity index 100% rename from drivers/net/wireless/zd1211rw/Makefile rename to drivers/net/wireless/zydas/zd1211rw/Makefile diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zydas/zd1211rw/zd_chip.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_chip.c rename to drivers/net/wireless/zydas/zd1211rw/zd_chip.c diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zydas/zd1211rw/zd_chip.h similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_chip.h rename to drivers/net/wireless/zydas/zd1211rw/zd_chip.h diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zydas/zd1211rw/zd_def.h similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_def.h rename to drivers/net/wireless/zydas/zd1211rw/zd_def.h diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_mac.c rename to drivers/net/wireless/zydas/zd1211rw/zd_mac.c diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h b/drivers/net/wireless/zydas/zd1211rw/zd_mac.h similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_mac.h rename to drivers/net/wireless/zydas/zd1211rw/zd_mac.h diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_rf.c rename to drivers/net/wireless/zydas/zd1211rw/zd_rf.c diff --git a/drivers/net/wireless/zd1211rw/zd_rf.h b/drivers/net/wireless/zydas/zd1211rw/zd_rf.h similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_rf.h rename to drivers/net/wireless/zydas/zd1211rw/zd_rf.h diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al2230.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_rf_al2230.c rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_al2230.c diff --git a/drivers/net/wireless/zd1211rw/zd_rf_al7230b.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_rf_al7230b.c rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_al7230b.c diff --git a/drivers/net/wireless/zd1211rw/zd_rf_rf2959.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_rf_rf2959.c rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_rf_uw2453.c rename to drivers/net/wireless/zydas/zd1211rw/zd_rf_uw2453.c diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_usb.c rename to drivers/net/wireless/zydas/zd1211rw/zd_usb.c diff --git a/drivers/net/wireless/zd1211rw/zd_usb.h b/drivers/net/wireless/zydas/zd1211rw/zd_usb.h similarity index 100% rename from drivers/net/wireless/zd1211rw/zd_usb.h rename to drivers/net/wireless/zydas/zd1211rw/zd_usb.h From eb4f98d5deb9b3a36e8b3ab7a9dec1b5ebc76e75 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 09:42:58 +0200 Subject: [PATCH 17/27] hostap: move under intersil vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/Makefile | 2 +- drivers/net/wireless/intersil/Kconfig | 16 ++++++++++++++++ drivers/net/wireless/intersil/Makefile | 1 + .../net/wireless/{ => intersil}/hostap/Kconfig | 0 .../net/wireless/{ => intersil}/hostap/Makefile | 0 .../net/wireless/{ => intersil}/hostap/hostap.h | 0 .../{ => intersil}/hostap/hostap_80211.h | 0 .../{ => intersil}/hostap/hostap_80211_rx.c | 0 .../{ => intersil}/hostap/hostap_80211_tx.c | 0 .../wireless/{ => intersil}/hostap/hostap_ap.c | 0 .../wireless/{ => intersil}/hostap/hostap_ap.h | 0 .../{ => intersil}/hostap/hostap_common.h | 0 .../{ => intersil}/hostap/hostap_config.h | 0 .../wireless/{ => intersil}/hostap/hostap_cs.c | 0 .../{ => intersil}/hostap/hostap_download.c | 0 .../wireless/{ => intersil}/hostap/hostap_hw.c | 0 .../wireless/{ => intersil}/hostap/hostap_info.c | 0 .../{ => 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%) diff --git a/MAINTAINERS b/MAINTAINERS index f2e78420488c..63c601b04e68 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5040,7 +5040,7 @@ L: hostap@shmoo.com (subscribers-only) L: linux-wireless@vger.kernel.org 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: platform-driver-x86@vger.kernel.org diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index e86dcdd5cfcb..da10b00d8af1 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 8f54adde831e..a60c5e55b55e 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/intersil/Kconfig b/drivers/net/wireless/intersil/Kconfig new file mode 100644 index 000000000000..ec80b9117fd2 --- /dev/null +++ b/drivers/net/wireless/intersil/Kconfig @@ -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 diff --git a/drivers/net/wireless/intersil/Makefile b/drivers/net/wireless/intersil/Makefile new file mode 100644 index 000000000000..4890ef79f280 --- /dev/null +++ b/drivers/net/wireless/intersil/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_HOSTAP) += hostap/ diff --git a/drivers/net/wireless/hostap/Kconfig b/drivers/net/wireless/intersil/hostap/Kconfig similarity index 100% rename from drivers/net/wireless/hostap/Kconfig rename to drivers/net/wireless/intersil/hostap/Kconfig diff --git a/drivers/net/wireless/hostap/Makefile b/drivers/net/wireless/intersil/hostap/Makefile similarity index 100% rename from drivers/net/wireless/hostap/Makefile rename to drivers/net/wireless/intersil/hostap/Makefile diff --git a/drivers/net/wireless/hostap/hostap.h b/drivers/net/wireless/intersil/hostap/hostap.h similarity index 100% rename from drivers/net/wireless/hostap/hostap.h rename to drivers/net/wireless/intersil/hostap/hostap.h diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/intersil/hostap/hostap_80211.h similarity index 100% rename from drivers/net/wireless/hostap/hostap_80211.h rename to drivers/net/wireless/intersil/hostap/hostap_80211.h diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/intersil/hostap/hostap_80211_rx.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_80211_rx.c rename to drivers/net/wireless/intersil/hostap/hostap_80211_rx.c diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/intersil/hostap/hostap_80211_tx.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_80211_tx.c rename to drivers/net/wireless/intersil/hostap/hostap_80211_tx.c diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_ap.c rename to drivers/net/wireless/intersil/hostap/hostap_ap.c diff --git a/drivers/net/wireless/hostap/hostap_ap.h b/drivers/net/wireless/intersil/hostap/hostap_ap.h similarity index 100% rename from drivers/net/wireless/hostap/hostap_ap.h rename to drivers/net/wireless/intersil/hostap/hostap_ap.h diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/intersil/hostap/hostap_common.h similarity index 100% rename from drivers/net/wireless/hostap/hostap_common.h rename to drivers/net/wireless/intersil/hostap/hostap_common.h diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/intersil/hostap/hostap_config.h similarity index 100% rename from drivers/net/wireless/hostap/hostap_config.h rename to drivers/net/wireless/intersil/hostap/hostap_config.h diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/intersil/hostap/hostap_cs.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_cs.c rename to drivers/net/wireless/intersil/hostap/hostap_cs.c diff --git a/drivers/net/wireless/hostap/hostap_download.c b/drivers/net/wireless/intersil/hostap/hostap_download.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_download.c rename to drivers/net/wireless/intersil/hostap/hostap_download.c diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/intersil/hostap/hostap_hw.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_hw.c rename to drivers/net/wireless/intersil/hostap/hostap_hw.c diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/intersil/hostap/hostap_info.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_info.c rename to drivers/net/wireless/intersil/hostap/hostap_info.c diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_ioctl.c rename to drivers/net/wireless/intersil/hostap/hostap_ioctl.c diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_main.c rename to drivers/net/wireless/intersil/hostap/hostap_main.c diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/intersil/hostap/hostap_pci.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_pci.c rename to drivers/net/wireless/intersil/hostap/hostap_pci.c diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/intersil/hostap/hostap_plx.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_plx.c rename to drivers/net/wireless/intersil/hostap/hostap_plx.c diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/intersil/hostap/hostap_proc.c similarity index 100% rename from drivers/net/wireless/hostap/hostap_proc.c rename to drivers/net/wireless/intersil/hostap/hostap_proc.c diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/intersil/hostap/hostap_wlan.h similarity index 100% rename from drivers/net/wireless/hostap/hostap_wlan.h rename to drivers/net/wireless/intersil/hostap/hostap_wlan.h From d3466830c165a298419788b88086ea99974e63ff Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 09:49:59 +0200 Subject: [PATCH 18/27] p54: move under intersil vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 drivers/net/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%) diff --git a/MAINTAINERS b/MAINTAINERS index 63c601b04e68..818899a4c268 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7956,7 +7956,7 @@ M: Christian Lamparter L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index da10b00d8af1..bea2fbb4a238 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index a60c5e55b55e..046963fc3958 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/intersil/Kconfig b/drivers/net/wireless/intersil/Kconfig index ec80b9117fd2..4bc3688bfa93 100644 --- a/drivers/net/wireless/intersil/Kconfig +++ b/drivers/net/wireless/intersil/Kconfig @@ -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 diff --git a/drivers/net/wireless/intersil/Makefile b/drivers/net/wireless/intersil/Makefile index 4890ef79f280..90a72830b1ae 100644 --- a/drivers/net/wireless/intersil/Makefile +++ b/drivers/net/wireless/intersil/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_HOSTAP) += hostap/ +obj-$(CONFIG_P54_COMMON) += p54/ diff --git a/drivers/net/wireless/p54/Kconfig b/drivers/net/wireless/intersil/p54/Kconfig similarity index 100% rename from drivers/net/wireless/p54/Kconfig rename to drivers/net/wireless/intersil/p54/Kconfig diff --git a/drivers/net/wireless/p54/Makefile b/drivers/net/wireless/intersil/p54/Makefile similarity index 100% rename from drivers/net/wireless/p54/Makefile rename to drivers/net/wireless/intersil/p54/Makefile diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/intersil/p54/eeprom.c similarity index 100% rename from drivers/net/wireless/p54/eeprom.c rename to drivers/net/wireless/intersil/p54/eeprom.c diff --git a/drivers/net/wireless/p54/eeprom.h b/drivers/net/wireless/intersil/p54/eeprom.h similarity index 100% rename from drivers/net/wireless/p54/eeprom.h rename to drivers/net/wireless/intersil/p54/eeprom.h diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/intersil/p54/fwio.c similarity index 100% rename from drivers/net/wireless/p54/fwio.c rename to drivers/net/wireless/intersil/p54/fwio.c diff --git a/drivers/net/wireless/p54/led.c b/drivers/net/wireless/intersil/p54/led.c similarity index 100% rename from drivers/net/wireless/p54/led.c rename to drivers/net/wireless/intersil/p54/led.c diff --git a/drivers/net/wireless/p54/lmac.h b/drivers/net/wireless/intersil/p54/lmac.h similarity index 100% rename from drivers/net/wireless/p54/lmac.h rename to drivers/net/wireless/intersil/p54/lmac.h diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/intersil/p54/main.c similarity index 100% rename from drivers/net/wireless/p54/main.c rename to drivers/net/wireless/intersil/p54/main.c diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/intersil/p54/p54.h similarity index 100% rename from drivers/net/wireless/p54/p54.h rename to drivers/net/wireless/intersil/p54/p54.h diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/intersil/p54/p54pci.c similarity index 100% rename from drivers/net/wireless/p54/p54pci.c rename to drivers/net/wireless/intersil/p54/p54pci.c diff --git a/drivers/net/wireless/p54/p54pci.h b/drivers/net/wireless/intersil/p54/p54pci.h similarity index 100% rename from drivers/net/wireless/p54/p54pci.h rename to drivers/net/wireless/intersil/p54/p54pci.h diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c similarity index 100% rename from drivers/net/wireless/p54/p54spi.c rename to drivers/net/wireless/intersil/p54/p54spi.c diff --git a/drivers/net/wireless/p54/p54spi.h b/drivers/net/wireless/intersil/p54/p54spi.h similarity index 100% rename from drivers/net/wireless/p54/p54spi.h rename to drivers/net/wireless/intersil/p54/p54spi.h diff --git a/drivers/net/wireless/p54/p54spi_eeprom.h b/drivers/net/wireless/intersil/p54/p54spi_eeprom.h similarity index 100% rename from drivers/net/wireless/p54/p54spi_eeprom.h rename to drivers/net/wireless/intersil/p54/p54spi_eeprom.h diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/intersil/p54/p54usb.c similarity index 100% rename from drivers/net/wireless/p54/p54usb.c rename to drivers/net/wireless/intersil/p54/p54usb.c diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/intersil/p54/p54usb.h similarity index 100% rename from drivers/net/wireless/p54/p54usb.h rename to drivers/net/wireless/intersil/p54/p54usb.h diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/intersil/p54/txrx.c similarity index 100% rename from drivers/net/wireless/p54/txrx.c rename to drivers/net/wireless/intersil/p54/txrx.c From 2be45b66dee080326d0f240aa4f18ef932cc3deb Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 09:57:18 +0200 Subject: [PATCH 19/27] orinoco: move under intersil vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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}/orinoco/Kconfig | 0 drivers/net/wireless/{ => intersil}/orinoco/Makefile | 0 drivers/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 drivers/net/wireless/{ => intersil}/orinoco/hermes.c | 0 drivers/net/wireless/{ => intersil}/orinoco/hermes.h | 0 drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.c | 0 drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.h | 0 drivers/net/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 drivers/net/wireless/{ => intersil}/orinoco/orinoco.h | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_cs.c | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_nortel.c | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.c | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.h | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_plx.c | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_tmd.c | 0 drivers/net/wireless/{ => intersil}/orinoco/orinoco_usb.c | 0 drivers/net/wireless/{ => intersil}/orinoco/scan.c | 0 drivers/net/wireless/{ => intersil}/orinoco/scan.h | 0 drivers/net/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%) diff --git a/MAINTAINERS b/MAINTAINERS index 818899a4c268..53c15af0d967 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7930,7 +7930,7 @@ L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index bea2fbb4a238..cc1f168603dc 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 046963fc3958..dd6d17cc4b7e 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/intersil/Kconfig b/drivers/net/wireless/intersil/Kconfig index 4bc3688bfa93..2b056b6daef8 100644 --- a/drivers/net/wireless/intersil/Kconfig +++ b/drivers/net/wireless/intersil/Kconfig @@ -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 diff --git a/drivers/net/wireless/intersil/Makefile b/drivers/net/wireless/intersil/Makefile index 90a72830b1ae..aedb713da746 100644 --- a/drivers/net/wireless/intersil/Makefile +++ b/drivers/net/wireless/intersil/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_HOSTAP) += hostap/ +obj-$(CONFIG_HERMES) += orinoco/ obj-$(CONFIG_P54_COMMON) += p54/ diff --git a/drivers/net/wireless/orinoco/Kconfig b/drivers/net/wireless/intersil/orinoco/Kconfig similarity index 100% rename from drivers/net/wireless/orinoco/Kconfig rename to drivers/net/wireless/intersil/orinoco/Kconfig diff --git a/drivers/net/wireless/orinoco/Makefile b/drivers/net/wireless/intersil/orinoco/Makefile similarity index 100% rename from drivers/net/wireless/orinoco/Makefile rename to drivers/net/wireless/intersil/orinoco/Makefile diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/intersil/orinoco/airport.c similarity index 100% rename from drivers/net/wireless/orinoco/airport.c rename to drivers/net/wireless/intersil/orinoco/airport.c diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/intersil/orinoco/cfg.c similarity index 100% rename from drivers/net/wireless/orinoco/cfg.c rename to drivers/net/wireless/intersil/orinoco/cfg.c diff --git a/drivers/net/wireless/orinoco/cfg.h b/drivers/net/wireless/intersil/orinoco/cfg.h similarity index 100% rename from drivers/net/wireless/orinoco/cfg.h rename to drivers/net/wireless/intersil/orinoco/cfg.h diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/intersil/orinoco/fw.c similarity index 100% rename from drivers/net/wireless/orinoco/fw.c rename to drivers/net/wireless/intersil/orinoco/fw.c diff --git a/drivers/net/wireless/orinoco/fw.h b/drivers/net/wireless/intersil/orinoco/fw.h similarity index 100% rename from drivers/net/wireless/orinoco/fw.h rename to drivers/net/wireless/intersil/orinoco/fw.h diff --git a/drivers/net/wireless/orinoco/hermes.c b/drivers/net/wireless/intersil/orinoco/hermes.c similarity index 100% rename from drivers/net/wireless/orinoco/hermes.c rename to drivers/net/wireless/intersil/orinoco/hermes.c diff --git a/drivers/net/wireless/orinoco/hermes.h b/drivers/net/wireless/intersil/orinoco/hermes.h similarity index 100% rename from drivers/net/wireless/orinoco/hermes.h rename to drivers/net/wireless/intersil/orinoco/hermes.h diff --git a/drivers/net/wireless/orinoco/hermes_dld.c b/drivers/net/wireless/intersil/orinoco/hermes_dld.c similarity index 100% rename from drivers/net/wireless/orinoco/hermes_dld.c rename to drivers/net/wireless/intersil/orinoco/hermes_dld.c diff --git a/drivers/net/wireless/orinoco/hermes_dld.h b/drivers/net/wireless/intersil/orinoco/hermes_dld.h similarity index 100% rename from drivers/net/wireless/orinoco/hermes_dld.h rename to drivers/net/wireless/intersil/orinoco/hermes_dld.h diff --git a/drivers/net/wireless/orinoco/hermes_rid.h b/drivers/net/wireless/intersil/orinoco/hermes_rid.h similarity index 100% rename from drivers/net/wireless/orinoco/hermes_rid.h rename to drivers/net/wireless/intersil/orinoco/hermes_rid.h diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/intersil/orinoco/hw.c similarity index 100% rename from drivers/net/wireless/orinoco/hw.c rename to drivers/net/wireless/intersil/orinoco/hw.c diff --git a/drivers/net/wireless/orinoco/hw.h b/drivers/net/wireless/intersil/orinoco/hw.h similarity index 100% rename from drivers/net/wireless/orinoco/hw.h rename to drivers/net/wireless/intersil/orinoco/hw.h diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/intersil/orinoco/main.c similarity index 100% rename from drivers/net/wireless/orinoco/main.c rename to drivers/net/wireless/intersil/orinoco/main.c diff --git a/drivers/net/wireless/orinoco/main.h b/drivers/net/wireless/intersil/orinoco/main.h similarity index 100% rename from drivers/net/wireless/orinoco/main.h rename to drivers/net/wireless/intersil/orinoco/main.h diff --git a/drivers/net/wireless/orinoco/mic.c b/drivers/net/wireless/intersil/orinoco/mic.c similarity index 100% rename from drivers/net/wireless/orinoco/mic.c rename to drivers/net/wireless/intersil/orinoco/mic.c diff --git a/drivers/net/wireless/orinoco/mic.h b/drivers/net/wireless/intersil/orinoco/mic.h similarity index 100% rename from drivers/net/wireless/orinoco/mic.h rename to drivers/net/wireless/intersil/orinoco/mic.h diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/intersil/orinoco/orinoco.h similarity index 100% rename from drivers/net/wireless/orinoco/orinoco.h rename to drivers/net/wireless/intersil/orinoco/orinoco.h diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/intersil/orinoco/orinoco_cs.c similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_cs.c rename to drivers/net/wireless/intersil/orinoco/orinoco_cs.c diff --git a/drivers/net/wireless/orinoco/orinoco_nortel.c b/drivers/net/wireless/intersil/orinoco/orinoco_nortel.c similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_nortel.c rename to drivers/net/wireless/intersil/orinoco/orinoco_nortel.c diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/intersil/orinoco/orinoco_pci.c similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_pci.c rename to drivers/net/wireless/intersil/orinoco/orinoco_pci.c diff --git a/drivers/net/wireless/orinoco/orinoco_pci.h b/drivers/net/wireless/intersil/orinoco/orinoco_pci.h similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_pci.h rename to drivers/net/wireless/intersil/orinoco/orinoco_pci.h diff --git a/drivers/net/wireless/orinoco/orinoco_plx.c b/drivers/net/wireless/intersil/orinoco/orinoco_plx.c similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_plx.c rename to drivers/net/wireless/intersil/orinoco/orinoco_plx.c diff --git a/drivers/net/wireless/orinoco/orinoco_tmd.c b/drivers/net/wireless/intersil/orinoco/orinoco_tmd.c similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_tmd.c rename to drivers/net/wireless/intersil/orinoco/orinoco_tmd.c diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c similarity index 100% rename from drivers/net/wireless/orinoco/orinoco_usb.c rename to drivers/net/wireless/intersil/orinoco/orinoco_usb.c diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/intersil/orinoco/scan.c similarity index 100% rename from drivers/net/wireless/orinoco/scan.c rename to drivers/net/wireless/intersil/orinoco/scan.c diff --git a/drivers/net/wireless/orinoco/scan.h b/drivers/net/wireless/intersil/orinoco/scan.h similarity index 100% rename from drivers/net/wireless/orinoco/scan.h rename to drivers/net/wireless/intersil/orinoco/scan.h diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/intersil/orinoco/spectrum_cs.c similarity index 100% rename from drivers/net/wireless/orinoco/spectrum_cs.c rename to drivers/net/wireless/intersil/orinoco/spectrum_cs.c diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/intersil/orinoco/wext.c similarity index 100% rename from drivers/net/wireless/orinoco/wext.c rename to drivers/net/wireless/intersil/orinoco/wext.c diff --git a/drivers/net/wireless/orinoco/wext.h b/drivers/net/wireless/intersil/orinoco/wext.h similarity index 100% rename from drivers/net/wireless/orinoco/wext.h rename to drivers/net/wireless/intersil/orinoco/wext.h From c12edfe27fcbdec7a654edfa1726d5555b558518 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 09:56:45 +0200 Subject: [PATCH 20/27] prism54: move under intersil vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- MAINTAINERS | 2 +- drivers/net/wireless/Kconfig | 20 ------------------- drivers/net/wireless/Makefile | 2 -- drivers/net/wireless/intersil/Kconfig | 20 +++++++++++++++++++ drivers/net/wireless/intersil/Makefile | 1 + .../wireless/{ => intersil}/prism54/Makefile | 0 .../{ => intersil}/prism54/isl_38xx.c | 0 .../{ => intersil}/prism54/isl_38xx.h | 0 .../{ => intersil}/prism54/isl_ioctl.c | 0 .../{ => intersil}/prism54/isl_ioctl.h | 0 .../wireless/{ => intersil}/prism54/isl_oid.h | 0 .../{ => intersil}/prism54/islpci_dev.c | 0 .../{ => intersil}/prism54/islpci_dev.h | 0 .../{ => intersil}/prism54/islpci_eth.c | 0 .../{ => intersil}/prism54/islpci_eth.h | 0 .../{ => intersil}/prism54/islpci_hotplug.c | 0 .../{ => intersil}/prism54/islpci_mgt.c | 0 .../{ => intersil}/prism54/islpci_mgt.h | 0 .../wireless/{ => intersil}/prism54/oid_mgt.c | 0 .../wireless/{ => intersil}/prism54/oid_mgt.h | 0 .../{ => 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%) diff --git a/MAINTAINERS b/MAINTAINERS index 53c15af0d967..2c41981e4fdd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8498,7 +8498,7 @@ M: "Luis R. Rodriguez" L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index cc1f168603dc..c92671f8b1c6 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index dd6d17cc4b7e..679a1a0a048d 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/intersil/Kconfig b/drivers/net/wireless/intersil/Kconfig index 2b056b6daef8..9da136049955 100644 --- a/drivers/net/wireless/intersil/Kconfig +++ b/drivers/net/wireless/intersil/Kconfig @@ -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 diff --git a/drivers/net/wireless/intersil/Makefile b/drivers/net/wireless/intersil/Makefile index aedb713da746..9a8cbfee3ea5 100644 --- a/drivers/net/wireless/intersil/Makefile +++ b/drivers/net/wireless/intersil/Makefile @@ -1,3 +1,4 @@ obj-$(CONFIG_HOSTAP) += hostap/ obj-$(CONFIG_HERMES) += orinoco/ obj-$(CONFIG_P54_COMMON) += p54/ +obj-$(CONFIG_PRISM54) += prism54/ diff --git a/drivers/net/wireless/prism54/Makefile b/drivers/net/wireless/intersil/prism54/Makefile similarity index 100% rename from drivers/net/wireless/prism54/Makefile rename to drivers/net/wireless/intersil/prism54/Makefile diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/intersil/prism54/isl_38xx.c similarity index 100% rename from drivers/net/wireless/prism54/isl_38xx.c rename to drivers/net/wireless/intersil/prism54/isl_38xx.c diff --git a/drivers/net/wireless/prism54/isl_38xx.h b/drivers/net/wireless/intersil/prism54/isl_38xx.h similarity index 100% rename from drivers/net/wireless/prism54/isl_38xx.h rename to drivers/net/wireless/intersil/prism54/isl_38xx.h diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/intersil/prism54/isl_ioctl.c similarity index 100% rename from drivers/net/wireless/prism54/isl_ioctl.c rename to drivers/net/wireless/intersil/prism54/isl_ioctl.c diff --git a/drivers/net/wireless/prism54/isl_ioctl.h b/drivers/net/wireless/intersil/prism54/isl_ioctl.h similarity index 100% rename from drivers/net/wireless/prism54/isl_ioctl.h rename to drivers/net/wireless/intersil/prism54/isl_ioctl.h diff --git a/drivers/net/wireless/prism54/isl_oid.h b/drivers/net/wireless/intersil/prism54/isl_oid.h similarity index 100% rename from drivers/net/wireless/prism54/isl_oid.h rename to drivers/net/wireless/intersil/prism54/isl_oid.h diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/intersil/prism54/islpci_dev.c similarity index 100% rename from drivers/net/wireless/prism54/islpci_dev.c rename to drivers/net/wireless/intersil/prism54/islpci_dev.c diff --git a/drivers/net/wireless/prism54/islpci_dev.h b/drivers/net/wireless/intersil/prism54/islpci_dev.h similarity index 100% rename from drivers/net/wireless/prism54/islpci_dev.h rename to drivers/net/wireless/intersil/prism54/islpci_dev.h diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/intersil/prism54/islpci_eth.c similarity index 100% rename from drivers/net/wireless/prism54/islpci_eth.c rename to drivers/net/wireless/intersil/prism54/islpci_eth.c diff --git a/drivers/net/wireless/prism54/islpci_eth.h b/drivers/net/wireless/intersil/prism54/islpci_eth.h similarity index 100% rename from drivers/net/wireless/prism54/islpci_eth.h rename to drivers/net/wireless/intersil/prism54/islpci_eth.h diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/intersil/prism54/islpci_hotplug.c similarity index 100% rename from drivers/net/wireless/prism54/islpci_hotplug.c rename to drivers/net/wireless/intersil/prism54/islpci_hotplug.c diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/intersil/prism54/islpci_mgt.c similarity index 100% rename from drivers/net/wireless/prism54/islpci_mgt.c rename to drivers/net/wireless/intersil/prism54/islpci_mgt.c diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/intersil/prism54/islpci_mgt.h similarity index 100% rename from drivers/net/wireless/prism54/islpci_mgt.h rename to drivers/net/wireless/intersil/prism54/islpci_mgt.h diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/intersil/prism54/oid_mgt.c similarity index 100% rename from drivers/net/wireless/prism54/oid_mgt.c rename to drivers/net/wireless/intersil/prism54/oid_mgt.c diff --git a/drivers/net/wireless/prism54/oid_mgt.h b/drivers/net/wireless/intersil/prism54/oid_mgt.h similarity index 100% rename from drivers/net/wireless/prism54/oid_mgt.h rename to drivers/net/wireless/intersil/prism54/oid_mgt.h diff --git a/drivers/net/wireless/prism54/prismcompat.h b/drivers/net/wireless/intersil/prism54/prismcompat.h similarity index 100% rename from drivers/net/wireless/prism54/prismcompat.h rename to drivers/net/wireless/intersil/prism54/prismcompat.h From 621417268569de9616c6c8e8e98dbd3209cd885a Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:09:24 +0200 Subject: [PATCH 21/27] realtek: create separate Kconfig file Add new a Kconfig file and a vendor config for realtek. Also update MAINTAINERS which we missed to do when earlier moving rtlwifi. Signed-off-by: Kalle Valo --- 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 diff --git a/MAINTAINERS b/MAINTAINERS index 2c41981e4fdd..a9f7f968f64e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9035,7 +9035,7 @@ L: linux-wireless@vger.kernel.org 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 @@ -9045,7 +9045,7 @@ L: linux-wireless@vger.kernel.org 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 @@ -9054,8 +9054,8 @@ L: linux-wireless@vger.kernel.org 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 diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index c92671f8b1c6..28af8b10a66e 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 679a1a0a048d..12f6c59668a5 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/realtek/Kconfig b/drivers/net/wireless/realtek/Kconfig new file mode 100644 index 000000000000..8a8ba2003964 --- /dev/null +++ b/drivers/net/wireless/realtek/Kconfig @@ -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 From 941a967c98362d6ba9a5d8bb6fdc1b70d7179602 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:15:33 +0200 Subject: [PATCH 22/27] rsi: add vendor Kconfig entry Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/Makefile | 3 +-- drivers/net/wireless/rsi/Kconfig | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 28af8b10a66e..518608403bd3 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 12f6c59668a5..d38b6cc338df 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/rsi/Kconfig b/drivers/net/wireless/rsi/Kconfig index 35245f994c10..7c5e4ca4e3d0 100644 --- a/drivers/net/wireless/rsi/Kconfig +++ b/drivers/net/wireless/rsi/Kconfig @@ -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 From 33aca94d797d7a8b6b4911ba02060c4fa9a0c47d Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:18:44 +0200 Subject: [PATCH 23/27] rt2x00: move under ralink vendor directory Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- 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 .../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 .../net/wireless/{ => ralink}/rt2x00/rt2800.h | 0 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.c | 0 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.h | 0 .../wireless/{ => ralink}/rt2x00/rt2800mmio.c | 0 .../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 .../net/wireless/{ => ralink}/rt2x00/rt2x00.h | 0 .../wireless/{ => ralink}/rt2x00/rt2x00config.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00crypto.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00debug.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00debug.h | 0 .../net/wireless/{ => ralink}/rt2x00/rt2x00dev.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00dump.h | 0 .../{ => ralink}/rt2x00/rt2x00firmware.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00leds.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00leds.h | 0 .../net/wireless/{ => ralink}/rt2x00/rt2x00lib.h | 0 .../wireless/{ => ralink}/rt2x00/rt2x00link.c | 0 .../net/wireless/{ => ralink}/rt2x00/rt2x00mac.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00mmio.c | 0 .../wireless/{ => ralink}/rt2x00/rt2x00mmio.h | 0 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.c | 0 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.h | 0 .../wireless/{ => ralink}/rt2x00/rt2x00queue.c | 0 .../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 .../net/wireless/{ => ralink}/rt2x00/rt61pci.c | 0 .../net/wireless/{ => ralink}/rt2x00/rt61pci.h | 0 .../net/wireless/{ => ralink}/rt2x00/rt73usb.c | 0 .../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%) diff --git a/MAINTAINERS b/MAINTAINERS index a9f7f968f64e..38c049d07966 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8801,7 +8801,7 @@ M: Stanislaw Gruszka M: Helmut Schaa L: linux-wireless@vger.kernel.org S: Maintained -F: drivers/net/wireless/rt2x00/ +F: drivers/net/wireless/ralink/rt2x00/ RAMDISK RAM BLOCK DEVICE DRIVER M: Jens Axboe diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 518608403bd3..c58e244b5079 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index d38b6cc338df..8ac72fd44d17 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/ralink/Kconfig b/drivers/net/wireless/ralink/Kconfig new file mode 100644 index 000000000000..41dbf3130e2b --- /dev/null +++ b/drivers/net/wireless/ralink/Kconfig @@ -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 diff --git a/drivers/net/wireless/ralink/Makefile b/drivers/net/wireless/ralink/Makefile new file mode 100644 index 000000000000..f84c0a2e4f4d --- /dev/null +++ b/drivers/net/wireless/ralink/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_RT2X00) += rt2x00/ diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/ralink/rt2x00/Kconfig similarity index 100% rename from drivers/net/wireless/rt2x00/Kconfig rename to drivers/net/wireless/ralink/rt2x00/Kconfig diff --git a/drivers/net/wireless/rt2x00/Makefile b/drivers/net/wireless/ralink/rt2x00/Makefile similarity index 100% rename from drivers/net/wireless/rt2x00/Makefile rename to drivers/net/wireless/ralink/rt2x00/Makefile diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2400pci.c rename to drivers/net/wireless/ralink/rt2x00/rt2400pci.c diff --git a/drivers/net/wireless/rt2x00/rt2400pci.h b/drivers/net/wireless/ralink/rt2x00/rt2400pci.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2400pci.h rename to drivers/net/wireless/ralink/rt2x00/rt2400pci.h diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2500pci.c rename to drivers/net/wireless/ralink/rt2x00/rt2500pci.c diff --git a/drivers/net/wireless/rt2x00/rt2500pci.h b/drivers/net/wireless/ralink/rt2x00/rt2500pci.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2500pci.h rename to drivers/net/wireless/ralink/rt2x00/rt2500pci.h diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2500usb.c rename to drivers/net/wireless/ralink/rt2x00/rt2500usb.c diff --git a/drivers/net/wireless/rt2x00/rt2500usb.h b/drivers/net/wireless/ralink/rt2x00/rt2500usb.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2500usb.h rename to drivers/net/wireless/ralink/rt2x00/rt2500usb.h diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/ralink/rt2x00/rt2800.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800.h rename to drivers/net/wireless/ralink/rt2x00/rt2800.h diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800lib.c rename to drivers/net/wireless/ralink/rt2x00/rt2800lib.c diff --git a/drivers/net/wireless/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800lib.h rename to drivers/net/wireless/ralink/rt2x00/rt2800lib.h diff --git a/drivers/net/wireless/rt2x00/rt2800mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800mmio.c rename to drivers/net/wireless/ralink/rt2x00/rt2800mmio.c diff --git a/drivers/net/wireless/rt2x00/rt2800mmio.h b/drivers/net/wireless/ralink/rt2x00/rt2800mmio.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800mmio.h rename to drivers/net/wireless/ralink/rt2x00/rt2800mmio.h diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800pci.c rename to drivers/net/wireless/ralink/rt2x00/rt2800pci.c diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/ralink/rt2x00/rt2800pci.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800pci.h rename to drivers/net/wireless/ralink/rt2x00/rt2800pci.h diff --git a/drivers/net/wireless/rt2x00/rt2800soc.c b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800soc.c rename to drivers/net/wireless/ralink/rt2x00/rt2800soc.c diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800usb.c rename to drivers/net/wireless/ralink/rt2x00/rt2800usb.c diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/ralink/rt2x00/rt2800usb.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2800usb.h rename to drivers/net/wireless/ralink/rt2x00/rt2800usb.h diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00.h diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00config.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00config.c diff --git a/drivers/net/wireless/rt2x00/rt2x00crypto.c b/drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00crypto.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00crypto.c diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00debug.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00debug.c diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.h b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00debug.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00debug.h diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00dev.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00dev.c diff --git a/drivers/net/wireless/rt2x00/rt2x00dump.h b/drivers/net/wireless/ralink/rt2x00/rt2x00dump.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00dump.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00dump.h diff --git a/drivers/net/wireless/rt2x00/rt2x00firmware.c b/drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00firmware.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00firmware.c diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.c b/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00leds.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00leds.c diff --git a/drivers/net/wireless/rt2x00/rt2x00leds.h b/drivers/net/wireless/ralink/rt2x00/rt2x00leds.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00leds.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00leds.h diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/ralink/rt2x00/rt2x00lib.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00lib.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00lib.h diff --git a/drivers/net/wireless/rt2x00/rt2x00link.c b/drivers/net/wireless/ralink/rt2x00/rt2x00link.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00link.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00link.c diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00mac.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00mac.c diff --git a/drivers/net/wireless/rt2x00/rt2x00mmio.c b/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00mmio.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00mmio.c diff --git a/drivers/net/wireless/rt2x00/rt2x00mmio.h b/drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00mmio.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00pci.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00pci.c diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/ralink/rt2x00/rt2x00pci.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00pci.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00pci.h diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00queue.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00queue.c diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00queue.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00queue.h diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/ralink/rt2x00/rt2x00reg.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00reg.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00reg.h diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00soc.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00soc.c diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.h b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00soc.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00soc.h diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00usb.c rename to drivers/net/wireless/ralink/rt2x00/rt2x00usb.c diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt2x00usb.h rename to drivers/net/wireless/ralink/rt2x00/rt2x00usb.h diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt61pci.c rename to drivers/net/wireless/ralink/rt2x00/rt61pci.c diff --git a/drivers/net/wireless/rt2x00/rt61pci.h b/drivers/net/wireless/ralink/rt2x00/rt61pci.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt61pci.h rename to drivers/net/wireless/ralink/rt2x00/rt61pci.h diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/ralink/rt2x00/rt73usb.c similarity index 100% rename from drivers/net/wireless/rt2x00/rt73usb.c rename to drivers/net/wireless/ralink/rt2x00/rt73usb.c diff --git a/drivers/net/wireless/rt2x00/rt73usb.h b/drivers/net/wireless/ralink/rt2x00/rt73usb.h similarity index 100% rename from drivers/net/wireless/rt2x00/rt73usb.h rename to drivers/net/wireless/ralink/rt2x00/rt73usb.h From 7b09ed5a09532d566c34f941bbcb2a813ef97afb Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:23:52 +0200 Subject: [PATCH 24/27] mediatek: unify Kconfig with other vendors Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- drivers/net/wireless/Kconfig | 2 +- drivers/net/wireless/Makefile | 3 +-- drivers/net/wireless/mediatek/Kconfig | 16 ++++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index c58e244b5079..2225e06611fa 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 8ac72fd44d17..0fa909072846 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/mediatek/Kconfig b/drivers/net/wireless/mediatek/Kconfig index cba300c6b5da..28843fed750a 100644 --- a/drivers/net/wireless/mediatek/Kconfig +++ b/drivers/net/wireless/mediatek/Kconfig @@ -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 From bd842171a8b7af696eece7157a988b7726ed641c Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:27:43 +0200 Subject: [PATCH 25/27] ti: unify Kconfig with other vendors 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. Signed-off-by: Kalle Valo --- 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(-) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 2225e06611fa..cb115db309ce 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 0fa909072846..8c99b9faab09 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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/ diff --git a/drivers/net/wireless/ti/Kconfig b/drivers/net/wireless/ti/Kconfig index cbe1e7fef61b..92fbd6597e34 100644 --- a/drivers/net/wireless/ti/Kconfig +++ b/drivers/net/wireless/ti/Kconfig @@ -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. -if WL_TI + 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_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 diff --git a/drivers/net/wireless/ti/wl1251/Kconfig b/drivers/net/wireless/ti/wl1251/Kconfig index 477a206c098e..7142ccf3a425 100644 --- a/drivers/net/wireless/ti/wl1251/Kconfig +++ b/drivers/net/wireless/ti/wl1251/Kconfig @@ -1,4 +1,4 @@ -menuconfig WL1251 +config WL1251 tristate "TI wl1251 driver support" depends on MAC80211 select FW_LOADER diff --git a/drivers/net/wireless/ti/wlcore/Kconfig b/drivers/net/wireless/ti/wlcore/Kconfig index 7c099542b214..969c9d79bfc8 100644 --- a/drivers/net/wireless/ti/wlcore/Kconfig +++ b/drivers/net/wireless/ti/wlcore/Kconfig @@ -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 From b5c9b4f91a6f91cdbf777e6f365d56debe500421 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:38:32 +0200 Subject: [PATCH 26/27] ath: unify Kconfig with other vendors Change menuconfig to config to keep the Kconfig entries unified. Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo --- drivers/net/wireless/Kconfig | 3 +-- drivers/net/wireless/Makefile | 3 +-- drivers/net/wireless/ath/Kconfig | 17 ++++++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index cb115db309ce..3af6d0b9ca21 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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 diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 8c99b9faab09..f00d42953fb8 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -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 diff --git a/drivers/net/wireless/ath/Kconfig b/drivers/net/wireless/ath/Kconfig index ce7826009eeb..44b2470af81d 100644 --- a/drivers/net/wireless/ath/Kconfig +++ b/drivers/net/wireless/ath/Kconfig @@ -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" From 6d808eba602b00f77f26191f45328774ff057cc0 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Wed, 18 Nov 2015 10:45:54 +0200 Subject: [PATCH 27/27] mac80211_hwsim: move Kconfig entry for sorting alphabetically mac80211_hwsim was not placed alphabetically correctly in menuconfig, fix that. Signed-off-by: Kalle Valo --- drivers/net/wireless/Kconfig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index 3af6d0b9ca21..8c8edaf1bba6 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -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. - endif # WLAN