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

[Larry Finger]

On 11/18/2015 08:46 AM, Kalle Valo wrote:

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 
---


Acked-by: Larry Finger 

Thanks,

Larry


  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 ..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



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

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

[Hauke Mehrtens]

On 11/18/2015 03:45 PM, Kalle Valo wrote:
> 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 
> ---

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

This way we have one directory less.

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

Re: [PATCH] drivers:staging:wilc1000 Fix comparison to NULL messages

[Bogicevic Sasa]

On 11/18, Sudip Mukherjee wrote:

On Tue, Nov 17, 2015 at 09:01:28PM +0100, Bogicevic Sasa wrote:

This fixes all "Comparison to NULL could be written like..."
messages from checkpatch.pl

Signed-off-by: Bogicevic Sasa 
---
 drivers/staging/wilc1000/coreconfigurator.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wilc1000/coreconfigurator.c 
b/drivers/staging/wilc1000/coreconfigurator.c
index fd7240c..a31ac55 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -434,7 +434,7 @@ s32 parse_network_info(u8 *pu8MsgBuffer, tstrNetworkInfo 
**ppstrNetworkInfo)

/* Get DTIM Period */
pu8TimElm = get_tim_elm(pu8msa, u16RxLen + FCS_LEN, u8index);
-   if (pu8TimElm != NULL)
+   if (!pu8TimElm)


You are now checking for -  if (pu8TimElm == NULL)  
It should actually be: if (pu8TimElm)

regards
sudip

Right, so stuped, Ill resend it
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Kalle Valo]

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 +
 .../net/wireless/{ => intersil}/prism54/Makefile   |0
 .../net/wireless/{ => intersil}/prism54/isl_38xx.c |0
 .../net/wireless/{ => intersil}/prism54/isl_38xx.h |0
 .../wireless/{ => intersil}/prism54/isl_ioctl.c|0
 .../wireless/{ => intersil}/prism54/isl_ioctl.h|0
 .../net/wireless/{ => intersil}/prism54/isl_oid.h  |0
 .../wireless/{ => intersil}/prism54/islpci_dev.c   |0
 .../wireless/{ => intersil}/prism54/islpci_dev.h   |0
 .../wireless/{ => intersil}/prism54/islpci_eth.c   |0
 .../wireless/{ => intersil}/prism54/islpci_eth.h   |0
 .../{ => intersil}/prism54/islpci_hotplug.c|0
 .../wireless/{ => intersil}/prism54/islpci_mgt.c   |0
 .../wireless/{ => intersil}/prism54/islpci_mgt.h   |0
 .../net/wireless/{ => intersil}/prism54/oid_mgt.c  |0
 .../net/wireless/{ => intersil}/prism54/oid_mgt.h  |0
 .../wireless/{ => intersil}/prism54/prismcompat.h  |0
 21 files changed, 22 insertions(+), 23 deletions(-)
 rename drivers/net/wireless/{ => intersil}/prism54/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/isl_oid.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_hotplug.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.c (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.h (100%)
 rename drivers/net/wireless/{ => intersil}/prism54/prismcompat.h (100%)

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 

[PATCH v2 04/27] b43: move under broadcom vendor directory

[Kalle Valo]

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
 drivers/net/wireless/{ => broadcom}/b43/debugfs.c  |0
 drivers/net/wireless/{ => broadcom}/b43/debugfs.h  |0
 drivers/net/wireless/{ => broadcom}/b43/dma.c  |0
 drivers/net/wireless/{ => broadcom}/b43/dma.h  |0
 drivers/net/wireless/{ => broadcom}/b43/leds.c |0
 drivers/net/wireless/{ => broadcom}/b43/leds.h |0
 drivers/net/wireless/{ => broadcom}/b43/lo.c   |0
 drivers/net/wireless/{ => broadcom}/b43/lo.h   |0
 drivers/net/wireless/{ => broadcom}/b43/main.c |0
 drivers/net/wireless/{ => broadcom}/b43/main.h |0
 drivers/net/wireless/{ => broadcom}/b43/phy_a.c|0
 drivers/net/wireless/{ => broadcom}/b43/phy_a.h|0
 drivers/net/wireless/{ => broadcom}/b43/phy_ac.c   |0
 drivers/net/wireless/{ => broadcom}/b43/phy_ac.h   |0
 .../net/wireless/{ => broadcom}/b43/phy_common.c   |0
 .../net/wireless/{ => broadcom}/b43/phy_common.h   |0
 drivers/net/wireless/{ => broadcom}/b43/phy_g.c|0
 drivers/net/wireless/{ => broadcom}/b43/phy_g.h|0
 drivers/net/wireless/{ => broadcom}/b43/phy_ht.c   |0
 drivers/net/wireless/{ => broadcom}/b43/phy_ht.h   |0
 drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c  |0
 drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h  |0
 drivers/net/wireless/{ => broadcom}/b43/phy_lp.c   |0
 drivers/net/wireless/{ => broadcom}/b43/phy_lp.h   |0
 drivers/net/wireless/{ => broadcom}/b43/phy_n.c|0
 drivers/net/wireless/{ => broadcom}/b43/phy_n.h|0
 drivers/net/wireless/{ => broadcom}/b43/pio.c  |0
 drivers/net/wireless/{ => broadcom}/b43/pio.h  |0
 drivers/net/wireless/{ => broadcom}/b43/ppr.c  |0
 drivers/net/wireless/{ => broadcom}/b43/ppr.h  |0
 .../net/wireless/{ => broadcom}/b43/radio_2055.c   |0
 .../net/wireless/{ => broadcom}/b43/radio_2055.h   |0
 .../net/wireless/{ => broadcom}/b43/radio_2056.c   |0
 .../net/wireless/{ => broadcom}/b43/radio_2056.h   |0
 .../net/wireless/{ => broadcom}/b43/radio_2057.c   |0
 .../net/wireless/{ => broadcom}/b43/radio_2057.h   |0
 .../net/wireless/{ => broadcom}/b43/radio_2059.c   |0
 .../net/wireless/{ => broadcom}/b43/radio_2059.h   |0
 drivers/net/wireless/{ => broadcom}/b43/rfkill.c   |0
 drivers/net/wireless/{ => broadcom}/b43/rfkill.h   |0
 drivers/net/wireless/{ => broadcom}/b43/sdio.c |0
 drivers/net/wireless/{ => broadcom}/b43/sdio.h |0
 drivers/net/wireless/{ => broadcom}/b43/sysfs.c|0
 drivers/net/wireless/{ => broadcom}/b43/sysfs.h|0
 drivers/net/wireless/{ => broadcom}/b43/tables.c   |0
 drivers/net/wireless/{ => broadcom}/b43/tables.h   |0
 .../net/wireless/{ => broadcom}/b43/tables_lpphy.c |0
 .../net/wireless/{ => broadcom}/b43/tables_lpphy.h |0
 .../net/wireless/{ => broadcom}/b43/tables_nphy.c  |0
 .../net/wireless/{ => broadcom}/b43/tables_nphy.h  |0
 .../wireless/{ => broadcom}/b43/tables_phy_ht.c|0
 .../wireless/{ => broadcom}/b43/tables_phy_ht.h|0
 .../wireless/{ => broadcom}/b43/tables_phy_lcn.c   |0
 .../wireless/{ => broadcom}/b43/tables_phy_lcn.h   |0
 drivers/net/wireless/{ => broadcom}/b43/wa.c   |0
 drivers/net/wireless/{ => broadcom}/b43/wa.h   |0
 drivers/net/wireless/{ => broadcom}/b43/xmit.c |0
 drivers/net/wireless/{ => broadcom}/b43/xmit.h |0
 68 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/broadcom/Kconfig
 create mode 100644 drivers/net/wireless/broadcom/Makefile
 rename drivers/net/wireless/{ => broadcom}/b43/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/b43.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/bus.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/bus.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/debugfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/debugfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43/leds.c (100%)
 rename drivers/net/wireless/{ => 

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

[Kalle Valo]

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
-- 
1.7.9.5

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

wireless-drivers-next.git closed until next week

[Kalle Valo]

Hi,

as I'm currently doing reorganisation in drivers/net/wireless I'm
keeping wireless-drivers-next.git closed until that's done. I expect to
start taking new patches sometime next week.

wireless-drivers.git is normally open for important bugfixes.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/1] rtlwifi: btcoexist: re-use %*ph specifier to hexdump

[Andy Shevchenko]

Instead of printing each byte from the given buffer the code is converted to
use %*ph specifier.

Signed-off-by: Andy Shevchenko 
---
 .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c| 23 ++
 .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c| 21 ++--
 .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c| 22 ++---
 .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c| 23 ++
 .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c| 21 ++--
 5 files changed, 30 insertions(+), 80 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c 
b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
index 53261d6..4514568 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8192e2ant.c
@@ -3356,9 +3356,8 @@ void ex_halbtc8192e2ant_display_coex_info(struct 
btc_coexist *btcoexist)
   "Dot11 channel / HsMode(HsChnl)",
   wifi_dot11_chnl, bt_hson, wifi_hs_chnl);
 
-   RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %02x %02x %02x ",
-  "H2C Wifi inform bt chnl Info", coex_dm->wifi_chnl_info[0],
-  coex_dm->wifi_chnl_info[1], coex_dm->wifi_chnl_info[2]);
+   RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %3ph ",
+  "H2C Wifi inform bt chnl Info", coex_dm->wifi_chnl_info);
 
btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, );
btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, _hs_rssi);
@@ -3409,17 +3408,9 @@ void ex_halbtc8192e2ant_display_coex_info(struct 
btc_coexist *btcoexist)
for (i = 0; i < BT_INFO_SRC_8192E_2ANT_MAX; i++) {
if (coex_sta->bt_info_c2h_cnt[i]) {
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-  "\r\n %-35s = %02x %02x %02x %02x ",
+  "\r\n %-35s = %7ph(%d)",
   GLBtInfoSrc8192e2Ant[i],
-  coex_sta->bt_info_c2h[i][0],
-  coex_sta->bt_info_c2h[i][1],
-  coex_sta->bt_info_c2h[i][2],
-  coex_sta->bt_info_c2h[i][3]);
-   RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-  "%02x %02x %02x(%d)",
-  coex_sta->bt_info_c2h[i][4],
-  coex_sta->bt_info_c2h[i][5],
-  coex_sta->bt_info_c2h[i][6],
+  coex_sta->bt_info_c2h[i],
   coex_sta->bt_info_c2h_cnt[i]);
}
}
@@ -3453,10 +3444,8 @@ void ex_halbtc8192e2ant_display_coex_info(struct 
btc_coexist *btcoexist)
 
ps_tdma_case = coex_dm->cur_ps_tdma;
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-  "\r\n %-35s = %02x %02x %02x %02x %02x case-%d (auto:%d)",
-  "PS TDMA", coex_dm->ps_tdma_para[0],
-  coex_dm->ps_tdma_para[1], coex_dm->ps_tdma_para[2],
-  coex_dm->ps_tdma_para[3], coex_dm->ps_tdma_para[4],
+  "\r\n %-35s = %5ph case-%d (auto:%d)",
+  "PS TDMA", coex_dm->ps_tdma_para,
   ps_tdma_case, coex_dm->auto_tdma_adjust);
 
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %d/ %d ",
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c 
b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
index c4acd40..7e239d3 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c
@@ -2457,10 +2457,9 @@ void ex_halbtc8723b1ant_display_coex_info(struct 
btc_coexist *btcoexist)
   "Dot11 channel / HsChnl(HsMode)",
   wifi_dot11_chnl, wifi_hs_chnl, bt_hs_on);
 
-   RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %02x %02x %02x ",
+   RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "\r\n %-35s = %3ph ",
   "H2C Wifi inform bt chnl Info",
-  coex_dm->wifi_chnl_info[0], coex_dm->wifi_chnl_info[1],
-  coex_dm->wifi_chnl_info[2]);
+  coex_dm->wifi_chnl_info);
 
btcoexist->btc_get(btcoexist, BTC_GET_S4_WIFI_RSSI, _rssi);
btcoexist->btc_get(btcoexist, BTC_GET_S4_HS_RSSI, _hs_rssi);
@@ -2525,15 +2524,9 @@ void ex_halbtc8723b1ant_display_coex_info(struct 
btc_coexist *btcoexist)
for (i = 0; i < BT_INFO_SRC_8723B_1ANT_MAX; i++) {
if (coex_sta->bt_info_c2h_cnt[i]) {
RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
-  "\r\n %-35s = %02x %02x %02x %02x %02x %02x 
%02x(%d)",
+   

[PATCH v2 22/27] rsi: add vendor Kconfig entry

[Kalle Valo]

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
-- 
1.7.9.5

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

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

[Kalle Valo]

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
-- 
1.7.9.5

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

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

[Kalle Valo]

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
 drivers/net/wireless/{ => ralink}/rt2x00/Makefile  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2400pci.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2400pci.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2500pci.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2500pci.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2500usb.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2500usb.h   |0
 drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800lib.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.c  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.h  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800pci.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800pci.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800soc.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800usb.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2800usb.h   |0
 drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h  |0
 .../wireless/{ => ralink}/rt2x00/rt2x00config.c|0
 .../wireless/{ => ralink}/rt2x00/rt2x00crypto.c|0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.c |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.h |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00dev.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00dump.h  |0
 .../wireless/{ => ralink}/rt2x00/rt2x00firmware.c  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.c  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.h  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00lib.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00link.c  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mac.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h  |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.c |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.h |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00reg.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.h   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.c   |0
 .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.h   |0
 drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c |0
 drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h |0
 drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c |0
 drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h |0
 51 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 drivers/net/wireless/ralink/Kconfig
 create mode 100644 drivers/net/wireless/ralink/Makefile
 rename drivers/net/wireless/{ => ralink}/rt2x00/Kconfig (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/Makefile (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800soc.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00config.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00crypto.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.c (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.h (100%)
 rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dev.c (100%)
 rename drivers/net/wireless/{ => 

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

[Kalle Valo]

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 +
 .../net/wireless/{ => intersil}/orinoco/Kconfig|0
 .../net/wireless/{ => intersil}/orinoco/Makefile   |0
 .../net/wireless/{ => intersil}/orinoco/airport.c  |0
 drivers/net/wireless/{ => intersil}/orinoco/cfg.c  |0
 drivers/net/wireless/{ => intersil}/orinoco/cfg.h  |0
 drivers/net/wireless/{ => intersil}/orinoco/fw.c   |0
 drivers/net/wireless/{ => intersil}/orinoco/fw.h   |0
 .../net/wireless/{ => intersil}/orinoco/hermes.c   |0
 .../net/wireless/{ => intersil}/orinoco/hermes.h   |0
 .../wireless/{ => intersil}/orinoco/hermes_dld.c   |0
 .../wireless/{ => intersil}/orinoco/hermes_dld.h   |0
 .../wireless/{ => intersil}/orinoco/hermes_rid.h   |0
 drivers/net/wireless/{ => intersil}/orinoco/hw.c   |0
 drivers/net/wireless/{ => intersil}/orinoco/hw.h   |0
 drivers/net/wireless/{ => intersil}/orinoco/main.c |0
 drivers/net/wireless/{ => intersil}/orinoco/main.h |0
 drivers/net/wireless/{ => intersil}/orinoco/mic.c  |0
 drivers/net/wireless/{ => intersil}/orinoco/mic.h  |0
 .../net/wireless/{ => intersil}/orinoco/orinoco.h  |0
 .../wireless/{ => intersil}/orinoco/orinoco_cs.c   |0
 .../{ => intersil}/orinoco/orinoco_nortel.c|0
 .../wireless/{ => intersil}/orinoco/orinoco_pci.c  |0
 .../wireless/{ => intersil}/orinoco/orinoco_pci.h  |0
 .../wireless/{ => intersil}/orinoco/orinoco_plx.c  |0
 .../wireless/{ => intersil}/orinoco/orinoco_tmd.c  |0
 .../wireless/{ => intersil}/orinoco/orinoco_usb.c  |0
 drivers/net/wireless/{ => intersil}/orinoco/scan.c |0
 drivers/net/wireless/{ => intersil}/orinoco/scan.h |0
 .../wireless/{ => intersil}/orinoco/spectrum_cs.c  |0
 drivers/net/wireless/{ => intersil}/orinoco/wext.c |0
 drivers/net/wireless/{ => intersil}/orinoco/wext.h |0
 36 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/net/wireless/{ => intersil}/orinoco/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/airport.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/cfg.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/cfg.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/fw.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/fw.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hermes_rid.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hw.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/hw.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/main.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/main.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/mic.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/mic.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_nortel.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_plx.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_tmd.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_usb.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/scan.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/scan.h (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/spectrum_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/wext.c (100%)
 rename drivers/net/wireless/{ => intersil}/orinoco/wext.h (100%)

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
--- 

[PATCH 1/1] wireless: airo: re-use mac_pton()

[Andy Shevchenko]

mac_pton() converts 6-byte MAC / BSSID to binary format. Change an open coded
variant by the generic one.

Signed-off-by: Andy Shevchenko 
---
 drivers/net/wireless/airo.c | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 17c40f0..7ad78e5 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -5137,21 +5137,9 @@ static void proc_APList_on_close( struct inode *inode, 
struct file *file ) {
memset(APList_rid, 0, sizeof(*APList_rid));
APList_rid->len = cpu_to_le16(sizeof(*APList_rid));
 
-   for( i = 0; i < 4 && data->writelen >= (i+1)*6*3; i++ ) {
-   int j;
-   for( j = 0; j < 6*3 && data->wbuffer[j+i*6*3]; j++ ) {
-   switch(j%3) {
-   case 0:
-   APList_rid->ap[i][j/3]=
-   hex_to_bin(data->wbuffer[j+i*6*3])<<4;
-   break;
-   case 1:
-   APList_rid->ap[i][j/3]|=
-   hex_to_bin(data->wbuffer[j+i*6*3]);
-   break;
-   }
-   }
-   }
+   for (i = 0; i < 4 && data->writelen >= (i + 1) * 6 * 3; i++)
+   mac_pton(data->wbuffer + i * 6 * 3, APList_rid.ap[i]);
+
disable_MAC(ai, 1);
writeAPListRid(ai, APList_rid, 1);
enable_MAC(ai, 1);
-- 
2.6.2

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

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

[Kalle Valo]

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
 .../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 

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

[Kalle Valo]

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

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 ..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
-- 
1.7.9.5

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

[PATCH v2 05/27] b43legacy: move under broadcom vendor directory

[Kalle Valo]

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 +
 .../net/wireless/{ => broadcom}/b43legacy/Kconfig  |0
 .../net/wireless/{ => broadcom}/b43legacy/Makefile |0
 .../wireless/{ => broadcom}/b43legacy/b43legacy.h  |0
 .../wireless/{ => broadcom}/b43legacy/debugfs.c|0
 .../wireless/{ => broadcom}/b43legacy/debugfs.h|0
 .../net/wireless/{ => broadcom}/b43legacy/dma.c|0
 .../net/wireless/{ => broadcom}/b43legacy/dma.h|0
 .../net/wireless/{ => broadcom}/b43legacy/ilt.c|0
 .../net/wireless/{ => broadcom}/b43legacy/ilt.h|0
 .../net/wireless/{ => broadcom}/b43legacy/leds.c   |0
 .../net/wireless/{ => broadcom}/b43legacy/leds.h   |0
 .../net/wireless/{ => broadcom}/b43legacy/main.c   |0
 .../net/wireless/{ => broadcom}/b43legacy/main.h   |0
 .../net/wireless/{ => broadcom}/b43legacy/phy.c|0
 .../net/wireless/{ => broadcom}/b43legacy/phy.h|0
 .../net/wireless/{ => broadcom}/b43legacy/pio.c|0
 .../net/wireless/{ => broadcom}/b43legacy/pio.h|0
 .../net/wireless/{ => broadcom}/b43legacy/radio.c  |0
 .../net/wireless/{ => broadcom}/b43legacy/radio.h  |0
 .../net/wireless/{ => broadcom}/b43legacy/rfkill.c |0
 .../net/wireless/{ => broadcom}/b43legacy/rfkill.h |0
 .../net/wireless/{ => broadcom}/b43legacy/sysfs.c  |0
 .../net/wireless/{ => broadcom}/b43legacy/sysfs.h  |0
 .../net/wireless/{ => broadcom}/b43legacy/xmit.c   |0
 .../net/wireless/{ => broadcom}/b43legacy/xmit.h   |0
 30 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/Kconfig (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/Makefile (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/b43legacy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/main.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/main.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.h (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.c (100%)
 rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.h (100%)

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-...@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)+= 

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

[Kalle Valo]

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
 .../net/wireless/{ => marvell}/mwifiex/11n_aggr.c  |0
 .../net/wireless/{ => marvell}/mwifiex/11n_aggr.h  |0
 .../wireless/{ => marvell}/mwifiex/11n_rxreorder.c |0
 .../wireless/{ => marvell}/mwifiex/11n_rxreorder.h |0
 drivers/net/wireless/{ => marvell}/mwifiex/Kconfig |0
 .../net/wireless/{ => marvell}/mwifiex/Makefile|0
 drivers/net/wireless/{ => marvell}/mwifiex/README  |0
 .../net/wireless/{ => marvell}/mwifiex/cfg80211.c  |0
 .../net/wireless/{ => marvell}/mwifiex/cfg80211.h  |0
 drivers/net/wireless/{ => marvell}/mwifiex/cfp.c   |0
 .../net/wireless/{ => marvell}/mwifiex/cmdevt.c|0
 .../net/wireless/{ => marvell}/mwifiex/debugfs.c   |0
 drivers/net/wireless/{ => marvell}/mwifiex/decl.h  |0
 .../net/wireless/{ => marvell}/mwifiex/ethtool.c   |0
 drivers/net/wireless/{ => marvell}/mwifiex/fw.h|0
 drivers/net/wireless/{ => marvell}/mwifiex/ie.c|0
 drivers/net/wireless/{ => marvell}/mwifiex/init.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h |0
 drivers/net/wireless/{ => marvell}/mwifiex/join.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/main.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/main.h  |0
 drivers/net/wireless/{ => marvell}/mwifiex/pcie.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/pcie.h  |0
 drivers/net/wireless/{ => marvell}/mwifiex/scan.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/sdio.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/sdio.h  |0
 .../net/wireless/{ => marvell}/mwifiex/sta_cmd.c   |0
 .../wireless/{ => marvell}/mwifiex/sta_cmdresp.c   |0
 .../net/wireless/{ => marvell}/mwifiex/sta_event.c |0
 .../net/wireless/{ => marvell}/mwifiex/sta_ioctl.c |0
 .../net/wireless/{ => marvell}/mwifiex/sta_rx.c|0
 .../net/wireless/{ => marvell}/mwifiex/sta_tx.c|0
 drivers/net/wireless/{ => marvell}/mwifiex/tdls.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/txrx.c  |0
 .../net/wireless/{ => marvell}/mwifiex/uap_cmd.c   |0
 .../net/wireless/{ => marvell}/mwifiex/uap_event.c |0
 .../net/wireless/{ => marvell}/mwifiex/uap_txrx.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/usb.c   |0
 drivers/net/wireless/{ => marvell}/mwifiex/usb.h   |0
 drivers/net/wireless/{ => marvell}/mwifiex/util.c  |0
 drivers/net/wireless/{ => marvell}/mwifiex/util.h  |0
 drivers/net/wireless/{ => marvell}/mwifiex/wmm.c   |0
 drivers/net/wireless/{ => marvell}/mwifiex/wmm.h   |0
 53 files changed, 3 insertions(+), 4 deletions(-)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11h.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/Kconfig (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/README (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cfp.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/cmdevt.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/debugfs.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/decl.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ethtool.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/fw.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ie.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/init.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/join.c (100%)
 rename drivers/net/wireless/{ => marvell}/mwifiex/main.c (100%)
 rename drivers/net/wireless/{ 

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

[Kalle Valo]

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 +
 drivers/net/wireless/{ => intersil}/hostap/Kconfig |0
 .../net/wireless/{ => intersil}/hostap/Makefile|0
 .../net/wireless/{ => intersil}/hostap/hostap.h|0
 .../wireless/{ => intersil}/hostap/hostap_80211.h  |0
 .../{ => intersil}/hostap/hostap_80211_rx.c|0
 .../{ => intersil}/hostap/hostap_80211_tx.c|0
 .../net/wireless/{ => intersil}/hostap/hostap_ap.c |0
 .../net/wireless/{ => intersil}/hostap/hostap_ap.h |0
 .../wireless/{ => intersil}/hostap/hostap_common.h |0
 .../wireless/{ => intersil}/hostap/hostap_config.h |0
 .../net/wireless/{ => intersil}/hostap/hostap_cs.c |0
 .../{ => intersil}/hostap/hostap_download.c|0
 .../net/wireless/{ => intersil}/hostap/hostap_hw.c |0
 .../wireless/{ => intersil}/hostap/hostap_info.c   |0
 .../wireless/{ => intersil}/hostap/hostap_ioctl.c  |0
 .../wireless/{ => intersil}/hostap/hostap_main.c   |0
 .../wireless/{ => intersil}/hostap/hostap_pci.c|0
 .../wireless/{ => intersil}/hostap/hostap_plx.c|0
 .../wireless/{ => intersil}/hostap/hostap_proc.c   |0
 .../wireless/{ => intersil}/hostap/hostap_wlan.h   |0
 25 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/intersil/Kconfig
 create mode 100644 drivers/net/wireless/intersil/Makefile
 rename drivers/net/wireless/{ => intersil}/hostap/Kconfig (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/Makefile (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_rx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_tx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_common.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_config.h (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_cs.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_download.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_hw.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_info.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_ioctl.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_main.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_pci.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_plx.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_proc.c (100%)
 rename drivers/net/wireless/{ => intersil}/hostap/hostap_wlan.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index f2e78420488c..63c601b04e68 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5040,7 +5040,7 @@ L:hos...@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-...@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/
 

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

[Kalle Valo]

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"
-- 
1.7.9.5

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

[PATCH v2 07/27] cw1200: move under st vendor directory

[Kalle Valo]

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
 drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c |0
 drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c  |0
 drivers/net/wireless/{ => st}/cw1200/debug.c   |0
 drivers/net/wireless/{ => st}/cw1200/debug.h   |0
 drivers/net/wireless/{ => st}/cw1200/fwio.c|0
 drivers/net/wireless/{ => st}/cw1200/fwio.h|0
 drivers/net/wireless/{ => st}/cw1200/hwbus.h   |0
 drivers/net/wireless/{ => st}/cw1200/hwio.c|0
 drivers/net/wireless/{ => st}/cw1200/hwio.h|0
 drivers/net/wireless/{ => st}/cw1200/main.c|0
 drivers/net/wireless/{ => st}/cw1200/pm.c  |0
 drivers/net/wireless/{ => st}/cw1200/pm.h  |0
 drivers/net/wireless/{ => st}/cw1200/queue.c   |0
 drivers/net/wireless/{ => st}/cw1200/queue.h   |0
 drivers/net/wireless/{ => st}/cw1200/scan.c|0
 drivers/net/wireless/{ => st}/cw1200/scan.h|0
 drivers/net/wireless/{ => st}/cw1200/sta.c |0
 drivers/net/wireless/{ => st}/cw1200/sta.h |0
 drivers/net/wireless/{ => st}/cw1200/txrx.c|0
 drivers/net/wireless/{ => st}/cw1200/txrx.h|0
 drivers/net/wireless/{ => st}/cw1200/wsm.c |0
 drivers/net/wireless/{ => st}/cw1200/wsm.h |0
 32 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/st/Kconfig
 create mode 100644 drivers/net/wireless/st/Makefile
 rename drivers/net/wireless/{ => st}/cw1200/Kconfig (100%)
 rename drivers/net/wireless/{ => st}/cw1200/Makefile (100%)
 rename drivers/net/wireless/{ => st}/cw1200/bh.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/bh.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/debug.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/debug.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/fwio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/fwio.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwbus.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwio.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/hwio.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/main.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/pm.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/pm.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/queue.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/queue.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/scan.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/scan.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/sta.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/sta.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/txrx.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/txrx.h (100%)
 rename drivers/net/wireless/{ => st}/cw1200/wsm.c (100%)
 rename drivers/net/wireless/{ => st}/cw1200/wsm.h (100%)

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 

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

[Kalle Valo]

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 +++
 .../net/wireless/{ => broadcom}/brcm80211/Kconfig  |0
 .../net/wireless/{ => broadcom}/brcm80211/Makefile |0
 .../{ => broadcom}/brcm80211/brcmfmac/Makefile |4 ++--
 .../{ => broadcom}/brcm80211/brcmfmac/bcdc.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/bcdc.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/btcoex.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/btcoex.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/bus.h|0
 .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/chip.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/chip.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/common.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/common.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/commonring.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/commonring.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/core.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/core.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/debug.c  |0
 .../{ => broadcom}/brcm80211/brcmfmac/debug.h  |0
 .../{ => broadcom}/brcm80211/brcmfmac/feature.c|0
 .../{ => broadcom}/brcm80211/brcmfmac/feature.h|0
 .../{ => broadcom}/brcm80211/brcmfmac/firmware.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/firmware.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/flowring.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/flowring.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/fweh.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/fweh.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/fwil_types.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/of.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/of.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/p2p.c|0
 .../{ => broadcom}/brcm80211/brcmfmac/p2p.h|0
 .../{ => broadcom}/brcm80211/brcmfmac/pcie.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/pcie.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/proto.c  |0
 .../{ => broadcom}/brcm80211/brcmfmac/proto.h  |0
 .../{ => broadcom}/brcm80211/brcmfmac/sdio.c   |0
 .../{ => broadcom}/brcm80211/brcmfmac/sdio.h   |0
 .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.h |0
 .../{ => broadcom}/brcm80211/brcmfmac/usb.c|0
 .../{ => broadcom}/brcm80211/brcmfmac/usb.h|0
 .../{ => broadcom}/brcm80211/brcmfmac/vendor.c |0
 .../{ => broadcom}/brcm80211/brcmfmac/vendor.h |0
 .../{ => broadcom}/brcm80211/brcmsmac/Makefile |6 +++---
 .../{ => broadcom}/brcm80211/brcmsmac/aiutils.c|0
 .../{ => broadcom}/brcm80211/brcmsmac/aiutils.h|0
 .../{ => broadcom}/brcm80211/brcmsmac/ampdu.c  |0
 .../{ => broadcom}/brcm80211/brcmsmac/ampdu.h  |0
 .../{ => broadcom}/brcm80211/brcmsmac/antsel.c |0
 .../{ => broadcom}/brcm80211/brcmsmac/antsel.h |0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h  |0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h  |0
 .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h   |0
 .../brcm80211/brcmsmac/brcms_trace_events.c|0
 .../brcm80211/brcmsmac/brcms_trace_events.h|0
 .../{ => broadcom}/brcm80211/brcmsmac/channel.c|0
 .../{ => broadcom}/brcm80211/brcmsmac/channel.h|0
 .../{ => broadcom}/brcm80211/brcmsmac/d11.h|0
 .../{ => broadcom}/brcm80211/brcmsmac/debug.c  |0
 .../{ => broadcom}/brcm80211/brcmsmac/debug.h  |0
 .../{ => broadcom}/brcm80211/brcmsmac/dma.c|0
 .../{ => broadcom}/brcm80211/brcmsmac/dma.h|0
 .../{ => broadcom}/brcm80211/brcmsmac/led.c|0
 .../{ => broadcom}/brcm80211/brcmsmac/led.h|0
 .../brcm80211/brcmsmac/mac80211_if.c   |0
 .../brcm80211/brcmsmac/mac80211_if.h   |0
 .../{ => broadcom}/brcm80211/brcmsmac/main.c   |

[PATCH v2 08/27] ipw2x00: move under intel vendor directory

[Kalle Valo]

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
 drivers/net/wireless/{ => intel}/ipw2x00/Makefile  |0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw.h |0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c |0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h |0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c |0
 drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h |0
 drivers/net/wireless/{ => intel}/ipw2x00/libipw.h  |0
 .../net/wireless/{ => intel}/ipw2x00/libipw_geo.c  |0
 .../wireless/{ => intel}/ipw2x00/libipw_module.c   |0
 .../net/wireless/{ => intel}/ipw2x00/libipw_rx.c   |0
 .../net/wireless/{ => intel}/ipw2x00/libipw_tx.c   |0
 .../net/wireless/{ => intel}/ipw2x00/libipw_wx.c   |0
 18 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 drivers/net/wireless/intel/Kconfig
 create mode 100644 drivers/net/wireless/intel/Makefile
 rename drivers/net/wireless/{ => intel}/ipw2x00/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw.h (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_geo.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_module.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_rx.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_tx.c (100%)
 rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_wx.c (100%)

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 ..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 

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

[Kalle Valo]

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
 drivers/net/wireless/{ => marvell}/libertas/README |0
 drivers/net/wireless/{ => marvell}/libertas/cfg.c  |0
 drivers/net/wireless/{ => marvell}/libertas/cfg.h  |0
 drivers/net/wireless/{ => marvell}/libertas/cmd.c  |0
 drivers/net/wireless/{ => marvell}/libertas/cmd.h  |0
 .../net/wireless/{ => marvell}/libertas/cmdresp.c  |0
 .../net/wireless/{ => marvell}/libertas/debugfs.c  |0
 .../net/wireless/{ => marvell}/libertas/debugfs.h  |0
 drivers/net/wireless/{ => marvell}/libertas/decl.h |0
 drivers/net/wireless/{ => marvell}/libertas/defs.h |0
 drivers/net/wireless/{ => marvell}/libertas/dev.h  |0
 .../net/wireless/{ => marvell}/libertas/ethtool.c  |0
 .../net/wireless/{ => marvell}/libertas/firmware.c |0
 drivers/net/wireless/{ => marvell}/libertas/host.h |0
 .../net/wireless/{ => marvell}/libertas/if_cs.c|0
 .../net/wireless/{ => marvell}/libertas/if_sdio.c  |0
 .../net/wireless/{ => marvell}/libertas/if_sdio.h  |0
 .../net/wireless/{ => marvell}/libertas/if_spi.c   |0
 .../net/wireless/{ => marvell}/libertas/if_spi.h   |0
 .../net/wireless/{ => marvell}/libertas/if_usb.c   |0
 .../net/wireless/{ => marvell}/libertas/if_usb.h   |0
 drivers/net/wireless/{ => marvell}/libertas/main.c |0
 drivers/net/wireless/{ => marvell}/libertas/mesh.c |0
 drivers/net/wireless/{ => marvell}/libertas/mesh.h |0
 .../net/wireless/{ => marvell}/libertas/radiotap.h |0
 drivers/net/wireless/{ => marvell}/libertas/rx.c   |0
 drivers/net/wireless/{ => marvell}/libertas/tx.c   |0
 .../net/wireless/{ => marvell}/libertas/types.h|0
 36 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/wireless/marvell/Kconfig
 create mode 100644 drivers/net/wireless/marvell/Makefile
 rename drivers/net/wireless/{ => marvell}/libertas/Kconfig (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/LICENSE (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/README (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cfg.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cfg.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmd.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/cmdresp.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/debugfs.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/debugfs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/decl.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/defs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/dev.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/ethtool.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/firmware.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/host.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_cs.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_spi.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_spi.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/if_usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/main.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/mesh.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/mesh.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/radiotap.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/rx.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/tx.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas/types.h (100%)

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-...@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 

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

[Kalle Valo]

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
-- 
1.7.9.5

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

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

[Kalle Valo]

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
 .../net/wireless/{ => intel}/iwlwifi/dvm/Makefile  |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h |0
 .../net/wireless/{ => intel}/iwlwifi/dvm/calib.c   |0
 .../net/wireless/{ => intel}/iwlwifi/dvm/calib.h   |0
 .../wireless/{ => intel}/iwlwifi/dvm/commands.h|0
 .../net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h |0
 .../net/wireless/{ => intel}/iwlwifi/dvm/devices.c |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c |0
 .../wireless/{ => intel}/iwlwifi/dvm/mac80211.c|0
 .../net/wireless/{ => intel}/iwlwifi/dvm/main.c|0
 .../net/wireless/{ => intel}/iwlwifi/dvm/power.c   |0
 .../net/wireless/{ => intel}/iwlwifi/dvm/power.h   |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c  |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h  |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c  |0
 .../net/wireless/{ => intel}/iwlwifi/dvm/rxon.c|0
 .../net/wireless/{ => intel}/iwlwifi/dvm/scan.c|0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c  |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h  |0
 drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c  |0
 .../net/wireless/{ => intel}/iwlwifi/dvm/ucode.c   |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-1000.c|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-2000.c|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-5000.c|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-6000.c|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-7000.c|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-8000.c|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h  |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-config.h  |0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-debug.c   |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-debug.h   |0
 .../{ => intel}/iwlwifi/iwl-devtrace-data.h|0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h |0
 .../{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h |0
 .../{ => intel}/iwlwifi/iwl-devtrace-msg.h |0
 .../{ => intel}/iwlwifi/iwl-devtrace-ucode.h   |0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace.c|0
 .../wireless/{ => intel}/iwlwifi/iwl-devtrace.h|0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c |0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h |0
 .../{ => intel}/iwlwifi/iwl-eeprom-parse.c |0
 .../{ => intel}/iwlwifi/iwl-eeprom-parse.h |0
 .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c |0
 .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h |0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h  |0
 .../{ => intel}/iwlwifi/iwl-fw-error-dump.h|0
 .../net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h |0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h  |0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c  |0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h  |0
 .../wireless/{ => intel}/iwlwifi/iwl-modparams.h   |0
 .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.c  |0
 .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.h  |0
 .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c   |0
 .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h   |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c  |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h  |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-prph.h|0
 drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-trans.c   |0
 .../net/wireless/{ => intel}/iwlwifi/iwl-trans.h   |0
 .../net/wireless/{ => intel}/iwlwifi/mvm/Makefile  |0
 .../net/wireless/{ => intel}/iwlwifi/mvm/binding.c |0
 .../net/wireless/{ => intel}/iwlwifi/mvm/coex.c|0
 .../wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c |0
 .../wireless/{ => intel}/iwlwifi/mvm/constants.h   |0
 drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c  |0
 .../wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c |0
 .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c |0
 .../net/wireless/{ => 

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

[Kalle Valo]

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 ++
 drivers/net/wireless/marvell/libertas_tf/Kconfig   |   18 ++
 .../wireless/{ => marvell}/libertas_tf/Makefile|0
 .../net/wireless/{ => marvell}/libertas_tf/cmd.c   |0
 .../wireless/{ => marvell}/libertas_tf/deb_defs.h  |0
 .../wireless/{ => marvell}/libertas_tf/if_usb.c|0
 .../wireless/{ => marvell}/libertas_tf/if_usb.h|0
 .../{ => marvell}/libertas_tf/libertas_tf.h|0
 .../net/wireless/{ => marvell}/libertas_tf/main.c  |0
 12 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 drivers/net/wireless/marvell/libertas_tf/Kconfig
 rename drivers/net/wireless/{ => marvell}/libertas_tf/Makefile (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/cmd.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/deb_defs.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.c (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/libertas_tf.h (100%)
 rename drivers/net/wireless/{ => marvell}/libertas_tf/main.c (100%)

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 ..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 

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

[Kalle Valo]

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 ..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 ..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 

[PATCH v2 09/27] iwlegacy: move under intel directory

[Kalle Valo]

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 ++
 .../net/wireless/{ => intel}/iwlegacy/3945-debug.c |0
 .../net/wireless/{ => intel}/iwlegacy/3945-mac.c   |0
 .../net/wireless/{ => intel}/iwlegacy/3945-rs.c|0
 drivers/net/wireless/{ => intel}/iwlegacy/3945.c   |0
 drivers/net/wireless/{ => intel}/iwlegacy/3945.h   |0
 .../net/wireless/{ => intel}/iwlegacy/4965-calib.c |0
 .../net/wireless/{ => intel}/iwlegacy/4965-debug.c |0
 .../net/wireless/{ => intel}/iwlegacy/4965-mac.c   |0
 .../net/wireless/{ => intel}/iwlegacy/4965-rs.c|0
 drivers/net/wireless/{ => intel}/iwlegacy/4965.c   |0
 drivers/net/wireless/{ => intel}/iwlegacy/4965.h   |0
 drivers/net/wireless/{ => intel}/iwlegacy/Kconfig  |0
 drivers/net/wireless/{ => intel}/iwlegacy/Makefile |0
 .../net/wireless/{ => intel}/iwlegacy/commands.h   |0
 drivers/net/wireless/{ => intel}/iwlegacy/common.c |0
 drivers/net/wireless/{ => intel}/iwlegacy/common.h |0
 drivers/net/wireless/{ => intel}/iwlegacy/csr.h|0
 drivers/net/wireless/{ => intel}/iwlegacy/debug.c  |0
 .../wireless/{ => intel}/iwlegacy/iwl-spectrum.h   |0
 drivers/net/wireless/{ => intel}/iwlegacy/prph.h   |0
 25 files changed, 4 insertions(+), 3 deletions(-)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-mac.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945-rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/3945.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-calib.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-mac.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965-rs.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/4965.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/Kconfig (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/Makefile (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/commands.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/common.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/common.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/csr.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/debug.c (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/iwl-spectrum.h (100%)
 rename drivers/net/wireless/{ => intel}/iwlegacy/prph.h (100%)

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
--- 

[PATCH v2 02/27] airo: move under cisco vendor directory

[Kalle Valo]

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 ..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 

[PATCH v2 00/27] wireless drivers vendor directories

[Kalle Valo]

Hi,

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

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

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

mac80211_hwsim
ray_cs
wl3501_cs
rndis_wlan

These Kconfig options are renamed:

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

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

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

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

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

Please review and send comments.

v2:

* move all drivers

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

 MAINTAINERS|   46 ++--
 drivers/net/wireless/Kconfig   |  238 +++-
 drivers/net/wireless/Makefile  |   65 ++
 drivers/net/wireless/admtek/Kconfig|   41 
 drivers/net/wireless/admtek/Makefile   |1 +
 drivers/net/wireless/{ => admtek}/adm8211.c|0
 drivers/net/wireless/{ => admtek}/adm8211.h|0
 drivers/net/wireless/ath/Kconfig   |   17 +-
 drivers/net/wireless/atmel/Kconfig |   57 +
 drivers/net/wireless/atmel/Makefile|5 +
 drivers/net/wireless/{ => atmel}/at76c50x-usb.c|0
 drivers/net/wireless/{ => atmel}/at76c50x-usb.h|0
 drivers/net/wireless/{ => atmel}/atmel.c   |0
 drivers/net/wireless/{ => atmel}/atmel.h   |0
 drivers/net/wireless/{ => atmel}/atmel_cs.c|0
 drivers/net/wireless/{ => atmel}/atmel_pci.c   |0
 drivers/net/wireless/broadcom/Kconfig  |   18 ++
 drivers/net/wireless/broadcom/Makefile |5 +
 drivers/net/wireless/{ => broadcom}/b43/Kconfig|0
 drivers/net/wireless/{ 

[PATCH v2 01/27] adm80211: move under admtek vendor directory

[Kalle Valo]

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 ..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 

[PATCH v2 03/27] atmel: move under atmel vendor directory

[Kalle Valo]

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 ++
 drivers/net/wireless/{ => atmel}/at76c50x-usb.c |0
 drivers/net/wireless/{ => atmel}/at76c50x-usb.h |0
 drivers/net/wireless/{ => atmel}/atmel.c|0
 drivers/net/wireless/{ => atmel}/atmel.h|0
 drivers/net/wireless/{ => atmel}/atmel_cs.c |0
 drivers/net/wireless/{ => atmel}/atmel_pci.c|0
 11 files changed, 65 insertions(+), 50 deletions(-)
 create mode 100644 drivers/net/wireless/atmel/Kconfig
 create mode 100644 drivers/net/wireless/atmel/Makefile
 rename drivers/net/wireless/{ => atmel}/at76c50x-usb.c (100%)
 rename drivers/net/wireless/{ => atmel}/at76c50x-usb.h (100%)
 rename drivers/net/wireless/{ => atmel}/atmel.c (100%)
 rename drivers/net/wireless/{ => atmel}/atmel.h (100%)
 rename drivers/net/wireless/{ => atmel}/atmel_cs.c (100%)
 rename drivers/net/wireless/{ => atmel}/atmel_pci.c (100%)

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 ..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 

[PATCH 1/4] staging: wilc1000: remove define COMPLEMENT_BOOT

[Glen Lee]

This patch removes define COMPLEMENT_BOOT in Makefile. The feature was removed
by the following commit but the define was not removed. So remove completely.

b46d68825c2d3af70ad18b53dfed6516e393b7fa

Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/staging/wilc1000/Makefile 
b/drivers/staging/wilc1000/Makefile
index 198d536..c55fdd2 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -1,7 +1,5 @@
 obj-$(CONFIG_WILC1000) += wilc1000.o
 
-ccflags-$(CONFIG_WILC1000_SDIO) += -DCOMPLEMENT_BOOT
-
 ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \
-DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \
-DP2P_CONCURRENCY_FIRMWARE=\"atmel/wilc1000_p2p_fw.bin\"
-- 
1.9.1

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

[PATCH 2/4] staging: wilc1000: remove wilc memory allocation config

[Glen Lee]

This patch remove memory allocation options in Kconfig. It was used a long time
ago to aquire memory, which we will not use this config anymore.
Remove it's config, related define and codes as well. We will take
PREALLOCATE_AT_LOADING_DRIVER as it is default.

Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/Kconfig | 22 
 drivers/staging/wilc1000/Makefile|  6 --
 drivers/staging/wilc1000/linux_wlan_common.h |  2 --
 drivers/staging/wilc1000/wilc_wlan.c | 30 
 4 files changed, 60 deletions(-)

diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig
index 2923122..dce9cee 100644
--- a/drivers/staging/wilc1000/Kconfig
+++ b/drivers/staging/wilc1000/Kconfig
@@ -31,28 +31,6 @@ config WILC1000_SPI
  immediately following reset when pin 9 (SDIO_SPI_CFG) is tied to
  VDDIO. Select this if your platform is using the SPI bus.
 
-choice
-prompt "WILC1000 Memory Allocation"
-depends on WILC1000
-default WILC1000_PREALLOCATE_AT_LOADING_DRIVER
-
-config WILC1000_PREALLOCATE_AT_LOADING_DRIVER
-   bool "Preallocate memory at loading driver"
-   ---help---
- This choice supports static allocation of the memory
- for the receive buffer. The driver will allocate the RX buffer
- during initial time. The driver will also free the buffer
- by calling network device stop.
-
-config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
-bool "Dynamically allocate memory in real time"
----help---
- This choice supports dynamic allocation of the memory
- for the receive buffer. The driver will allocate the RX buffer
- when it is required.
-endchoice
-
-
 config WILC1000_HW_OOB_INTR
bool "WILC1000 out of band interrupt"
depends on WILC1000_SDIO
diff --git a/drivers/staging/wilc1000/Makefile 
b/drivers/staging/wilc1000/Makefile
index c55fdd2..cd71be9 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -7,12 +7,6 @@ ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \
 ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 -DWILC_DEBUGFS
 #ccflags-y += -DTCP_ACK_FILTER
 
-ccflags-$(CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER) += -DMEMORY_STATIC \
-   
-DWILC_PREALLOC_AT_INSMOD
-
-ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC
-
-
 wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
wilc_msgqueue.o \
coreconfigurator.o host_interface.o \
diff --git a/drivers/staging/wilc1000/linux_wlan_common.h 
b/drivers/staging/wilc1000/linux_wlan_common.h
index 72b524a..5d40f05 100644
--- a/drivers/staging/wilc1000/linux_wlan_common.h
+++ b/drivers/staging/wilc1000/linux_wlan_common.h
@@ -124,9 +124,7 @@ extern atomic_t WILC_DEBUG_LEVEL;
 #define FN_IN   /* PRINT_D(">>> \n") */
 #define FN_OUT  /* PRINT_D("<<<\n") */
 
-#ifdef MEMORY_STATIC
 #define LINUX_RX_SIZE  (96 * 1024)
-#endif
 #define LINUX_TX_SIZE  (64 * 1024)
 
 
diff --git a/drivers/staging/wilc1000/wilc_wlan.c 
b/drivers/staging/wilc1000/wilc_wlan.c
index a73e99f..10def3f 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -12,10 +12,8 @@ typedef struct {
u32 cfg_frame_offset;
int cfg_seq_no;
 
-   #ifdef MEMORY_STATIC
u8 *rx_buffer;
u32 rx_buffer_offset;
-   #endif
u8 *tx_buffer;
u32 tx_buffer_offset;
 
@@ -1050,9 +1048,6 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc)
if (offset >= size)
break;
} while (1);
-#ifndef MEMORY_STATIC
-   kfree(buffer);
-#endif
kfree(rqe);
 
if (has_packet)
@@ -1097,9 +1092,7 @@ static void wilc_sleeptimer_isr_ext(struct wilc *wilc, 
u32 int_stats1)
 static void wilc_wlan_handle_isr_ext(struct wilc *wilc, u32 int_status)
 {
wilc_wlan_dev_t *p = _wlan;
-#ifdef MEMORY_STATIC
u32 offset = p->rx_buffer_offset;
-#endif
u8 *buffer = NULL;
u32 size;
u32 retries = 0;
@@ -1118,7 +,6 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, 
u32 int_status)
}
 
if (size > 0) {
-#ifdef MEMORY_STATIC
if (LINUX_RX_SIZE - offset < size)
offset = 0;
 
@@ -1129,13 +1121,6 @@ static void wilc_wlan_handle_isr_ext(struct wilc *wilc, 
u32 int_status)
goto _end_;
}
 
-#else
-   buffer = kmalloc(size, GFP_KERNEL);
-   if (!buffer) {
-   usleep_range(100 * 1000, 100 * 1000);
-   goto _end_;
-   }
-#endif
p->hif_func.hif_clear_int_ext(wilc,
  

[PATCH 4/4] staging: wilc1000: use kernel define byte order macros

[Glen Lee]

This patch removes define BIG_ENDIAN and use kernel define byte order macros
instead of swap itself. Remove unused BYTE_SWAP macro and __CHECK_ENDIAN__
in Makefile also.

Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/Makefile|  2 +-
 drivers/staging/wilc1000/wilc_sdio.c |  8 ++--
 drivers/staging/wilc1000/wilc_spi.c  | 16 
 drivers/staging/wilc1000/wilc_wlan.c | 22 ++
 drivers/staging/wilc1000/wilc_wlan.h | 11 ---
 drivers/staging/wilc1000/wilc_wlan_cfg.c | 16 +++-
 6 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/drivers/staging/wilc1000/Makefile 
b/drivers/staging/wilc1000/Makefile
index cd71be9..2076743 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -4,7 +4,7 @@ ccflags-y += -DSTA_FIRMWARE=\"atmel/wilc1000_fw.bin\" \
-DAP_FIRMWARE=\"atmel/wilc1000_ap_fw.bin\" \
-DP2P_CONCURRENCY_FIRMWARE=\"atmel/wilc1000_p2p_fw.bin\"
 
-ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 -DWILC_DEBUGFS
+ccflags-y += -I$(src)/ -DWILC_ASIC_A0 -DWILC_DEBUGFS
 #ccflags-y += -DTCP_ACK_FILTER
 
 wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
diff --git a/drivers/staging/wilc1000/wilc_sdio.c 
b/drivers/staging/wilc1000/wilc_sdio.c
index a68a7a4..6eae08e 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -163,9 +163,7 @@ static int sdio_clear_int(struct wilc *wilc)
  /
 static int sdio_write_reg(struct wilc *wilc, u32 addr, u32 data)
 {
-#ifdef BIG_ENDIAN
-   data = BYTE_SWAP(data);
-#endif
+   data = cpu_to_le32(data);
 
if ((addr >= 0xf0) && (addr <= 0xff)) {
sdio_cmd52_t cmd;
@@ -330,9 +328,7 @@ static int sdio_read_reg(struct wilc *wilc, u32 addr, u32 
*data)
}
}
 
-#ifdef BIG_ENDIAN
-   *data = BYTE_SWAP(*data);
-#endif
+   *data = cpu_to_le32(*data);
 
return 1;
 
diff --git a/drivers/staging/wilc1000/wilc_spi.c 
b/drivers/staging/wilc1000/wilc_spi.c
index b6a6ce2..20e2532 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -529,9 +529,7 @@ static int spi_internal_write(struct wilc *wilc, u32 adr, 
u32 dat)
 {
int result;
 
-#ifdef BIG_ENDIAN
-   dat = BYTE_SWAP(dat);
-#endif
+   dat = cpu_to_le32(dat);
result = spi_cmd_complete(wilc, CMD_INTERNAL_WRITE, adr, (u8 *), 4,
  0);
if (result != N_OK) {
@@ -552,9 +550,7 @@ static int spi_internal_read(struct wilc *wilc, u32 adr, 
u32 *data)
return 0;
}
 
-#ifdef BIG_ENDIAN
-   *data = BYTE_SWAP(*data);
-#endif
+   *data = cpu_to_le32(*data);
 
return 1;
 }
@@ -571,9 +567,7 @@ static int wilc_spi_write_reg(struct wilc *wilc, u32 addr, 
u32 data)
u8 cmd = CMD_SINGLE_WRITE;
u8 clockless = 0;
 
-#ifdef BIG_ENDIAN
-   data = BYTE_SWAP(data);
-#endif
+   data = cpu_to_le32(data);
if (addr < 0x30) {
/* Clockless register*/
cmd = CMD_INTERNAL_WRITE;
@@ -635,9 +629,7 @@ static int wilc_spi_read_reg(struct wilc *wilc, u32 addr, 
u32 *data)
return 0;
}
 
-#ifdef BIG_ENDIAN
-   *data = BYTE_SWAP(*data);
-#endif
+   *data = cpu_to_le32(*data);
 
return 1;
 }
diff --git a/drivers/staging/wilc1000/wilc_wlan.c 
b/drivers/staging/wilc1000/wilc_wlan.c
index 27a44ee..a74a95e 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -759,9 +759,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 
*txq_count)
vmm_table[i] |= BIT(10);
PRINT_D(TX_DBG, "VMMTable entry changed 
for CFG packet = %d\n", vmm_table[i]);
}
-#ifdef BIG_ENDIAN
-   vmm_table[i] = BYTE_SWAP(vmm_table[i]);
-#endif
+   vmm_table[i] = cpu_to_le32(vmm_table[i]);
 
i++;
sum += vmm_sz;
@@ -886,9 +884,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 
*txq_count)
if (tqe && (vmm_table[i] != 0)) {
u32 header, buffer_offset;
 
-#ifdef BIG_ENDIAN
-   vmm_table[i] = BYTE_SWAP(vmm_table[i]);
-#endif
+   vmm_table[i] = cpu_to_le32(vmm_table[i]);
vmm_sz = (vmm_table[i] & 0x3ff);
vmm_sz *= 4;
header = (tqe->type << 31) |
@@ -899,9 +895,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 
*txq_count)
else
header &= ~BIT(30);
 
-#ifdef BIG_ENDIAN
-

[PATCH 3/4] staging: wilc1000: rename index to tcp_pending_ack_idx

[Glen Lee]

This patch renames "index" of struct txq_entry_t to tcp_pending_ack_idx since
this name could be confused index of txq_entry_t. It is index of tcp pending
ack.

It fixes 8e55639d066f4ef402ba88fca08ed1be70e1c4da

Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wlan.c | 12 ++--
 drivers/staging/wilc1000/wilc_wlan.h |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wlan.c 
b/drivers/staging/wilc1000/wilc_wlan.c
index 10def3f..27a44ee 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -249,7 +249,7 @@ static inline int add_tcp_pending_ack(u32 ack, u32 
session_index,
pending_acks_info[pending_base + pending_acks].ack_num = ack;
pending_acks_info[pending_base + pending_acks].txqe = txqe;
pending_acks_info[pending_base + pending_acks].session_index = 
session_index;
-   txqe->index = pending_base + pending_acks;
+   txqe->tcp_pending_ack_idx = pending_base + pending_acks;
pending_acks++;
}
return 0;
@@ -421,7 +421,7 @@ static int wilc_wlan_txq_add_cfg_pkt(struct wilc *wilc, u8 
*buffer, u32 buffer_s
tqe->tx_complete_func = NULL;
tqe->priv = NULL;
 #ifdef TCP_ACK_FILTER
-   tqe->index = NOT_TCP_ACK;
+   tqe->tcp_pending_ack_idx = NOT_TCP_ACK;
 #endif
PRINT_D(TX_DBG, "Adding the config packet at the Queue tail\n");
 
@@ -451,7 +451,7 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void 
*priv, u8 *buffer,
 
PRINT_D(TX_DBG, "Adding mgmt packet at the Queue tail\n");
 #ifdef TCP_ACK_FILTER
-   tqe->index = NOT_TCP_ACK;
+   tqe->tcp_pending_ack_idx = NOT_TCP_ACK;
if (is_tcp_ack_filter_enabled())
tcp_process(dev, tqe);
 #endif
@@ -478,7 +478,7 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void 
*priv, u8 *buffer,
tqe->tx_complete_func = func;
tqe->priv = priv;
 #ifdef TCP_ACK_FILTER
-   tqe->index = NOT_TCP_ACK;
+   tqe->tcp_pending_ack_idx = NOT_TCP_ACK;
 #endif
PRINT_D(TX_DBG, "Adding Network packet at the Queue tail\n");
wilc_wlan_txq_add_to_tail(dev, tqe);
@@ -923,8 +923,8 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 
*txq_count)
tqe->tx_complete_func(tqe->priv,
  tqe->status);
#ifdef TCP_ACK_FILTER
-   if (tqe->index != NOT_TCP_ACK)
-   pending_acks_info[tqe->index].txqe = 
NULL;
+   if (tqe->tcp_pending_ack_idx != NOT_TCP_ACK)
+   
pending_acks_info[tqe->tcp_pending_ack_idx].txqe = NULL;
#endif
kfree(tqe);
} else {
diff --git a/drivers/staging/wilc1000/wilc_wlan.h 
b/drivers/staging/wilc1000/wilc_wlan.h
index 2ac63a3..27c7bbb 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -216,7 +216,7 @@ struct txq_entry_t {
struct txq_entry_t *next;
struct txq_entry_t *prev;
int type;
-   int index;
+   int tcp_pending_ack_idx;
u8 *buffer;
int buffer_size;
void *priv;
-- 
1.9.1

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

Re: [PATCH v2 1/2] ath6kl_sdio: Add reset gpio module parameter for CHIP_PWD_L pin

[Julian Calaby]

Hi Steve,

A few more comments:

On Thu, Nov 19, 2015 at 10:20 AM, Steve deRosier  wrote:
> Many ath6k chips have a reset pin, usually labeled CHIP_PWD_L. This pin can
> be pulled low by the host processor to hold the wifi chip in reset. By
> holding the chip in reset, the lowest power consumption available can be
> achieved.
>
> This adds a module parameter so the ath6kl_sdio driver can control the
> CHIP_PWD_L pin if the implementer so desires. This code is only available
> if GPIOLIB is configured.
>
> Signed-off-by: Steve deRosier 
> ---
>  drivers/net/wireless/ath/ath6kl/sdio.c | 73 
> +-
>  1 file changed, 72 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c 
> b/drivers/net/wireless/ath/ath6kl/sdio.c
> index eab0ab9..c0755eb 100644
> --- a/drivers/net/wireless/ath/ath6kl/sdio.c
> +++ b/drivers/net/wireless/ath/ath6kl/sdio.c
> @@ -23,6 +23,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include "hif.h"
>  #include "hif-ops.h"
>  #include "target.h"
> @@ -67,8 +68,15 @@ struct ath6kl_sdio {
>
> /* protects access to wr_asyncq */
> spinlock_t wr_async_lock;
> +

Extra line.

>  };
>
> +static unsigned int reset_pwd_gpio = ARCH_NR_GPIOS;
> +#ifdef CONFIG_GPIOLIB
> +module_param(reset_pwd_gpio, uint, 0644);
> +MODULE_PARM_DESC(reset_pwd_gpio, "WIFI CHIP_PWD reset pin GPIO");
> +#endif
> +
>  #define CMD53_ARG_READ  0
>  #define CMD53_ARG_WRITE 1
>  #define CMD53_ARG_BLOCK_BASIS   1
> @@ -1414,20 +1422,83 @@ static struct sdio_driver ath6kl_sdio_driver = {
> .drv.pm = ATH6KL_SDIO_PM_OPS,
>  };
>
> +/* Delay to avoid the mmc driver calling the probe on the prior notice of
> + * the chip, which we just killed. If this is missing, it results in a
> + * spurious warning:
> + * "ath6kl_sdio: probe of mmc0:0001:1 failed with error -110"
> + *
> + * Time chosen experimentally, with padding
> + */
> +#define ATH6KL_MMC_PROBE_DELAY 150

IIRC, this should be at the top of the file with the other #defines.

> +
> +static int ath6kl_sdio_init_gpio(void)
> +{
> +   int ret = 0;
> +
> +   if (gpio_is_valid(reset_pwd_gpio)) {
> +   /* Request the reset GPIO, and assert it to make sure we get a
> +* clean boot in-case we had a floating input or other issue.
> +*/
> +   ret = gpio_request_one(reset_pwd_gpio,
> +  GPIOF_OUT_INIT_LOW |
> +  GPIOF_EXPORT_DIR_FIXED,
> +  "WIFI_RESET");
> +   if (ret) {
> +   ath6kl_err("Unable to get WIFI power gpio: %d\n", 
> ret);
> +   return ret;
> +   }
> +
> +   ath6kl_dbg(ATH6KL_DBG_SUSPEND, "Setup wifi gpio #%d\n",
> +  reset_pwd_gpio);
> +   usleep_range(20, 50); /* Pin must be asserted at least 5 usec 
> */
> +   gpio_set_value(reset_pwd_gpio, 1); /* De-assert the pin */
> +
> +   msleep(ATH6KL_MMC_PROBE_DELAY);
> +   }
> +
> +   return 0;
> +}
> +
> +static void ath6kl_sdio_release_gpio(void)
> +{
> +   if (gpio_is_valid(reset_pwd_gpio)) {
> +   /* Be sure we leave the chip in reset when we unload and also
> +* release the GPIO
> +*/
> +   gpio_set_value(reset_pwd_gpio, 0);
> +   gpio_free(reset_pwd_gpio);
> +   }
> +}
> +
>  static int __init ath6kl_sdio_init(void)
>  {
> int ret;
>
> -   ret = sdio_register_driver(_sdio_driver);
> +   ret = ath6kl_sdio_init_gpio();
> if (ret)
> +   goto err_gpio;
> +
> +   ret = sdio_register_driver(_sdio_driver);
> +   if (ret) {
> ath6kl_err("sdio driver registration failed: %d\n", ret);
> +   goto err_register;
> +   }
>
> return ret;
> +
> +err_register:
> +   ath6kl_sdio_release_gpio();
> +
> +err_gpio:
> +   return ret;
>  }
>
>  static void __exit ath6kl_sdio_exit(void)
>  {
> sdio_unregister_driver(_sdio_driver);
> +
> +   if (gpio_is_valid(reset_pwd_gpio))

This if statement is unnecessary as you do it again inside
ath6kl_sdio_release_gpio()

Thanks,

-- 
Julian Calaby

Email: julian.cal...@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 1/2] ath6kl_sdio: Add reset gpio module parameter for CHIP_PWD_L pin

[Steve deRosier]

Many ath6k chips have a reset pin, usually labeled CHIP_PWD_L. This pin can
be pulled low by the host processor to hold the wifi chip in reset. By
holding the chip in reset, the lowest power consumption available can be
achieved.

This adds a module parameter so the ath6kl_sdio driver can control the
CHIP_PWD_L pin if the implementer so desires. This code is only available
if GPIOLIB is configured.

Signed-off-by: Steve deRosier 
---
 drivers/net/wireless/ath/ath6kl/sdio.c | 73 +-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c 
b/drivers/net/wireless/ath/ath6kl/sdio.c
index eab0ab9..c0755eb 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "hif.h"
 #include "hif-ops.h"
 #include "target.h"
@@ -67,8 +68,15 @@ struct ath6kl_sdio {
 
/* protects access to wr_asyncq */
spinlock_t wr_async_lock;
+
 };
 
+static unsigned int reset_pwd_gpio = ARCH_NR_GPIOS;
+#ifdef CONFIG_GPIOLIB
+module_param(reset_pwd_gpio, uint, 0644);
+MODULE_PARM_DESC(reset_pwd_gpio, "WIFI CHIP_PWD reset pin GPIO");
+#endif
+
 #define CMD53_ARG_READ  0
 #define CMD53_ARG_WRITE 1
 #define CMD53_ARG_BLOCK_BASIS   1
@@ -1414,20 +1422,83 @@ static struct sdio_driver ath6kl_sdio_driver = {
.drv.pm = ATH6KL_SDIO_PM_OPS,
 };
 
+/* Delay to avoid the mmc driver calling the probe on the prior notice of
+ * the chip, which we just killed. If this is missing, it results in a
+ * spurious warning:
+ * "ath6kl_sdio: probe of mmc0:0001:1 failed with error -110"
+ *
+ * Time chosen experimentally, with padding
+ */
+#define ATH6KL_MMC_PROBE_DELAY 150
+
+static int ath6kl_sdio_init_gpio(void)
+{
+   int ret = 0;
+
+   if (gpio_is_valid(reset_pwd_gpio)) {
+   /* Request the reset GPIO, and assert it to make sure we get a
+* clean boot in-case we had a floating input or other issue.
+*/
+   ret = gpio_request_one(reset_pwd_gpio,
+  GPIOF_OUT_INIT_LOW |
+  GPIOF_EXPORT_DIR_FIXED,
+  "WIFI_RESET");
+   if (ret) {
+   ath6kl_err("Unable to get WIFI power gpio: %d\n", ret);
+   return ret;
+   }
+
+   ath6kl_dbg(ATH6KL_DBG_SUSPEND, "Setup wifi gpio #%d\n",
+  reset_pwd_gpio);
+   usleep_range(20, 50); /* Pin must be asserted at least 5 usec */
+   gpio_set_value(reset_pwd_gpio, 1); /* De-assert the pin */
+
+   msleep(ATH6KL_MMC_PROBE_DELAY);
+   }
+
+   return 0;
+}
+
+static void ath6kl_sdio_release_gpio(void)
+{
+   if (gpio_is_valid(reset_pwd_gpio)) {
+   /* Be sure we leave the chip in reset when we unload and also
+* release the GPIO
+*/
+   gpio_set_value(reset_pwd_gpio, 0);
+   gpio_free(reset_pwd_gpio);
+   }
+}
+
 static int __init ath6kl_sdio_init(void)
 {
int ret;
 
-   ret = sdio_register_driver(_sdio_driver);
+   ret = ath6kl_sdio_init_gpio();
if (ret)
+   goto err_gpio;
+
+   ret = sdio_register_driver(_sdio_driver);
+   if (ret) {
ath6kl_err("sdio driver registration failed: %d\n", ret);
+   goto err_register;
+   }
 
return ret;
+
+err_register:
+   ath6kl_sdio_release_gpio();
+
+err_gpio:
+   return ret;
 }
 
 static void __exit ath6kl_sdio_exit(void)
 {
sdio_unregister_driver(_sdio_driver);
+
+   if (gpio_is_valid(reset_pwd_gpio))
+   ath6kl_sdio_release_gpio();
 }
 
 module_init(ath6kl_sdio_init);
-- 
1.9.1

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

[PATCH v2 0/2] ath6kl_sdio: add control of CHIP_PWD_L via GPIO

[Steve deRosier]

This set of two patches adds the ablity for ath6kl_sdio to control the
CHIP_PWD_L pin on startup and for suspend/wakeup. This is importaint because
on some platforms, this is the only way to achieve minimum power consumption.
The CHIP_PWD_L pin is used to hold the ath chip in reset and this is the
proper way to achieve its lowest power state (per QCA's datasheets).

This GPIO is controled by the kernel standard GPIOLIB and as such depends on
CONFIG_GPIOLIB. If this isn't enabled, then the various usages will generally
compile out. Even if enabled, by default the GPIO is set to an invalid number,
and each use will check: if not a valid GPIO, then behavior will be unchanged.

This adds a new module parameter to allow the user to set the GPIO to use.

To utilize:
modprobe ath6kl_sdio reset_pwd_gpio=28
Where "28" should be replaced by the GPIO id of the pin connected to the
CHIP_PWD_L pin on the wifi chip.

v2:

Changes due to review comments
* Fix __init and __exit on gpio init/cleanup functions
* Remove unnecessary #ifdef defines on GPIO as gpio.h already takes care of it
* Utilize already available ARCH_NR_GPIOS
* Remove msleep on exit as the problem it resolves is taken care of a different
  patch.

This applies against kvalo/ath.git master branch

Steve deRosier (2):
  ath6kl_sdio: Add reset gpio module parameter for CHIP_PWD_L pin
  ath6kl_sdio: Add power gpio reset feature into sdio driver for suspend

 drivers/net/wireless/ath/ath6kl/sdio.c | 113 -
 1 file changed, 110 insertions(+), 3 deletions(-)

-- 
1.9.1

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

[PATCH v2 2/2] ath6kl_sdio: Add power gpio reset feature into sdio driver for suspend

[Steve deRosier]

This change adds pm suspend callbacks in order to trigger a gpio line
to push the CHIP_PWD_L reset/power line low on suspend. This puts the chip
into the lowest power state on suspend. On resume, it releases the line,
allowing the chip to boot. Slower, but provides a clean reset of the
chip and recovery from standby.

Signed-off-by: Steve deRosier 
---
 drivers/net/wireless/ath/ath6kl/sdio.c | 40 --
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c 
b/drivers/net/wireless/ath/ath6kl/sdio.c
index c0755eb..c411033 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -1288,8 +1288,44 @@ static int ath6kl_sdio_pm_resume(struct device *device)
return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(ath6kl_sdio_pm_ops, ath6kl_sdio_pm_suspend,
-ath6kl_sdio_pm_resume);
+/* Below handlers leverage the PM system to make sure we turn on and off
+ * the power gpio at the right time. If we do it in the earlier power on
+ * and off handlers for the sdio, we get errors from the mmc subsystem.
+ */
+static int ath6kl_sdio_pm_suspend_late(struct device *device)
+{
+   ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio pm ath6kl_sdio_pm_suspend_late\n");
+
+   if (gpio_is_valid(reset_pwd_gpio))
+   gpio_set_value(reset_pwd_gpio, 0);
+
+   return 0;
+}
+
+static int ath6kl_sdio_pm_resume_early(struct device *device)
+{
+   ath6kl_dbg(ATH6KL_DBG_SUSPEND, "sdio pm ath6kl_sdio_pm_resume_early\n");
+
+   if (gpio_is_valid(reset_pwd_gpio)) {
+   gpio_set_value(reset_pwd_gpio, 1);
+   usleep_range(1000, 5000); /* wait for power up */
+   }
+   return 0;
+}
+
+/* The GPIO version requires the more complex dev_pm_ops setup */
+const struct dev_pm_ops ath6kl_sdio_pm_ops = {
+   .suspend = ath6kl_sdio_pm_suspend,
+   .suspend_late = ath6kl_sdio_pm_suspend_late,
+   .resume_early = ath6kl_sdio_pm_resume_early,
+   .resume = ath6kl_sdio_pm_resume,
+   .freeze = ath6kl_sdio_pm_suspend,
+   .thaw = ath6kl_sdio_pm_resume,
+   .poweroff = ath6kl_sdio_pm_suspend,
+   .poweroff_late = ath6kl_sdio_pm_suspend_late,
+   .restore_early = ath6kl_sdio_pm_resume_early,
+   .restore = ath6kl_sdio_pm_resume,
+};
 
 #define ATH6KL_SDIO_PM_OPS (_sdio_pm_ops)
 
-- 
1.9.1

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

Re: linux-wireless rebased (probably for the last time) on 4.4-rc1

[Bruno Antunes]

On 17 November 2015 at 14:07, Kalle Valo  wrote:
>
> "John W. Linville"  writes:
>
> > The wireless-testing tree has been rebased on top of 4.4-rc1.  The
> > current head of the tree is eced3b090878ddba643bbed599e6edea4ad90f49.
> > Please update any downstream trees accordingly!
> >
> > It has been almost a year since I turned-over wireless maintenance
> > duties to Johannes and Kalle. At that time I agreed to continue
> > maintaining the wireless-testing tree for the duration of 2015 to help
> > those that were still relying on it. The end of 2015 is coming soon,
> > and with it I intend to stop maintaining wireless-testing.
> >
> > If you are still relying on wireless-testing, then I implore you to
> > find another option to satisfy your needs. If someone would like to
> > continue maintaining wireless-testing yourself, then please contact
> > me and I will attempt to assist you in such a transition.
> >
> > Thanks for all the fish!
>
> Thank you John. I have been using wireless-testing in my main laptop for
> god knows how many years and I hate to see it go. I consider it as the
> safest way to test the latest wireless code as it's just the latest -rc
> release from Linux plus mac80211 and wireless-drivers trees. linux-next
> is just too experimental for me, I don't want that anywhere near my
> laptop :) It would be interesting to know what others think about
> wireless-testing and how much users that tree really has?

Apparently not many...
I’ve been using it for over a year and I agree that Its a very convenient
way for getting the latest code.

>
> I hope we can find some solution and wireless-testing continues to
> exist. Otherwise testing latest wireless code will become more
> difficult.

Is this tree very difficult to maintain?
In case there are no volunteers what will be future options for using
the latest wireless code?
I think I still don't understand the all developer process. The
wireless wiki [1]
says the diagram is out of date, thats obvious, since wireless tree is now
wireless-drivers and the maintainer is Kalle.
wireless-drivers > net -> linux
So what is the process for wireless-testing tree, the merge of linux,
mac80211and wireless-drivers trees?

Regards,
Bruno

[1] https://wireless.wiki.kernel.org/en/developers/process

>
> --
> Kalle Valo
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/2] ath6kl_sdio: Add reset gpio module parameter for CHIP_PWD_L pin

[kbuild test robot]

Hi Steve,

[auto build test ERROR on wireless-drivers-next/master]
[also build test ERROR on v4.4-rc1 next-20151118]

url:
https://github.com/0day-ci/linux/commits/Steve-deRosier/ath6kl_sdio-add-control-of-CHIP_PWD_L-via-GPIO/20151119-072439
base:   
https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git 
master
config: m68k-allyesconfig (attached as .config)
reproduce:
wget 
https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross
 -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=m68k 

All errors (new ones prefixed by >>):

>> drivers/net/wireless/ath/ath6kl/sdio.c:74:38: error: 'ARCH_NR_GPIOS' 
>> undeclared here (not in a function)
static unsigned int reset_pwd_gpio = ARCH_NR_GPIOS;
 ^

vim +/ARCH_NR_GPIOS +74 drivers/net/wireless/ath/ath6kl/sdio.c

68  
69  /* protects access to wr_asyncq */
70  spinlock_t wr_async_lock;
71  
72  };
73  
  > 74  static unsigned int reset_pwd_gpio = ARCH_NR_GPIOS;
75  #ifdef CONFIG_GPIOLIB
76  module_param(reset_pwd_gpio, uint, 0644);
77  MODULE_PARM_DESC(reset_pwd_gpio, "WIFI CHIP_PWD reset pin GPIO");

---
0-DAY kernel test infrastructureOpen Source Technology Center
https://lists.01.org/pipermail/kbuild-all   Intel Corporation


.config.gz
Description: Binary data

Re: linux-wireless rebased (probably for the last time) on 4.4-rc1

[Bob Copeland]

On Wed, Nov 18, 2015 at 11:44:43PM +, Bruno Antunes wrote:
> On 17 November 2015 at 14:07, Kalle Valo  wrote:
> >
> > I hope we can find some solution and wireless-testing continues to
> > exist. Otherwise testing latest wireless code will become more
> > difficult.
> 
> Is this tree very difficult to maintain?
> In case there are no volunteers what will be future options for using
> the latest wireless code?

I also tend to use wireless-testing as the main kernel on my laptop, and
find it handy at times to have both recent drivers and mac80211 changes
in the same tree without resorting to backports or merging the trees
myself.  Not much problem doing those, but if I'm going to do it anyway...
might as well share.

So, I'd be willing to help keep it running for a time after said sunset
date.

> says the diagram is out of date, thats obvious, since wireless tree is now
> wireless-drivers and the maintainer is Kalle.
> wireless-drivers > net -> linux
> So what is the process for wireless-testing tree, the merge of linux,
> mac80211and wireless-drivers trees?

mac80211 and wireless-drivers go into net, wireless-testing doesn't
go upstream; it's exactly just for testing.  That said, it's an easy
base to work against since all the bits are reasonably up-to-date.

-- 
Bob Copeland %% http://bobcopeland.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

State of indoor navigation (11MC) in wireless core API

[Anatol Pomozov]

Hi

There is huge interest both from hardwire and software vendors in
using Indoor Navigation at mobile devices. We are interested in making
the ChromeOS ecosystem using this feature as well.

I checked how Android implements indoor navigation where it is used
for a while. It defines its custom API called Round-trip time [1].
Broadcom chips firmware implements 11MC draft for this.

I looked at current Linux tree and do not see any standard API for
this feature. iwlwifi/mvm/debugfs-vif.c file mentions "Time of Flight"
that seems 11MC related. Though this driver uses debugfs to
communicate with the driver. It does not sound like a best way to do
it. I would expect a callback in cfg80211 interface. Does anybody work
on more conventional API for this 11MC feature?

I expect that many wireless chips are going to implement 11MC in the
nearest future. Having such clean API from the start will simplify the
feature development.

[1] 
https://android.googlesource.com/platform/hardware/libhardware_legacy/+/master/include/hardware_legacy/rtt.h
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ath6kl: Don't print error message when recv is canceled

[Steve deRosier]

An error message ath6kl_htc_rxmsg_pending_handler isn't appropate for when
the error is ECANCELED. This could be the result of a perfectly appropriate
RX cancel due to shutdown or suspend. This allows the right cleanup to
continue, but without an alarming error message in this particular case.

Signed-off-by: Steve deRosier 
---
 drivers/net/wireless/ath/ath6kl/htc_mbox.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c 
b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index fffb65b..65c31da 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -,8 +,9 @@ int ath6kl_htc_rxmsg_pending_handler(struct htc_target 
*target,
}
 
if (status) {
-   ath6kl_err("failed to get pending recv messages: %d\n",
-  status);
+   if (status != -ECANCELED)
+   ath6kl_err("failed to get pending recv messages: %d\n",
+  status);
 
/* cleanup any packets in sync completion queue */
list_for_each_entry_safe(packets, tmp_pkt, _pktq, list) {
-- 
1.9.1

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

[RESEND PATCH] nfc: Drop owner assignment from i2c_driver

[Krzysztof Kozlowski]

i2c_driver does not need to set an owner because i2c_register_driver()
will set it.

Signed-off-by: Krzysztof Kozlowski 

---

The coccinelle script which generated the patch was sent here:
http://www.spinics.net/lists/kernel/msg2029903.html
---
 drivers/nfc/nxp-nci/i2c.c  | 1 -
 drivers/nfc/pn544/i2c.c| 1 -
 drivers/nfc/st-nci/i2c.c   | 1 -
 drivers/nfc/st21nfca/i2c.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index df4333c7ee0f..9ddeff62bd12 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -446,7 +446,6 @@ MODULE_DEVICE_TABLE(acpi, acpi_id);
 static struct i2c_driver nxp_nci_i2c_driver = {
.driver = {
   .name = NXP_NCI_I2C_DRIVER_NAME,
-  .owner  = THIS_MODULE,
   .acpi_match_table = ACPI_PTR(acpi_id),
   .of_match_table = of_match_ptr(of_nxp_nci_i2c_match),
  },
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index fa75c53f3fa5..a095523309cf 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -1162,7 +1162,6 @@ MODULE_DEVICE_TABLE(of, of_pn544_i2c_match);
 static struct i2c_driver pn544_hci_i2c_driver = {
.driver = {
   .name = PN544_HCI_I2C_DRIVER_NAME,
-  .owner  = THIS_MODULE,
   .of_match_table = of_match_ptr(of_pn544_i2c_match),
   .acpi_match_table = ACPI_PTR(pn544_hci_i2c_acpi_match),
  },
diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index 15e3ce2d274c..9c369ff3a52b 100644
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -370,7 +370,6 @@ MODULE_DEVICE_TABLE(of, of_st_nci_i2c_match);
 
 static struct i2c_driver st_nci_i2c_driver = {
.driver = {
-   .owner = THIS_MODULE,
.name = ST_NCI_I2C_DRIVER_NAME,
.of_match_table = of_match_ptr(of_st_nci_i2c_match),
},
diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c
index a98da33e680a..9e628de6a154 100644
--- a/drivers/nfc/st21nfca/i2c.c
+++ b/drivers/nfc/st21nfca/i2c.c
@@ -681,7 +681,6 @@ MODULE_DEVICE_TABLE(of, of_st21nfca_i2c_match);
 
 static struct i2c_driver st21nfca_hci_i2c_driver = {
.driver = {
-   .owner = THIS_MODULE,
.name = ST21NFCA_HCI_I2C_DRIVER_NAME,
.of_match_table = of_match_ptr(of_st21nfca_i2c_match),
},
-- 
1.9.1

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

Re: [PATCH 1/4] staging: wilc1000: remove define COMPLEMENT_BOOT

[Dan Carpenter]

On Thu, Nov 19, 2015 at 11:05:58AM +0900, Glen Lee wrote:
> This patch removes define COMPLEMENT_BOOT in Makefile. The feature was removed
> by the following commit but the define was not removed. So remove completely.
> 
> b46d68825c2d3af70ad18b53dfed6516e393b7fa

Put some human readable text next to the hash.  The standard thing is to
include only the first 12 characters of the hash.  If there are fewer
than 12 characters then we could get collisions but including the whole
hash is excessive.

This patch removes define COMPLEMENT_BOOT in Makefile. The feature was
removed by commit b46d68825c2d ('staging: wilc1000: remove
COMPLEMENT_BOOT') but the define was not removed. So remove completely.

regards,
dan carpenter

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

Re: [PATCH 3/4] staging: wilc1000: rename index to tcp_pending_ack_idx

[glen lee]

On 2015년 11월 19일 15:23, Dan Carpenter wrote:

On Thu, Nov 19, 2015 at 11:06:00AM +0900, Glen Lee wrote:

This patch renames "index" of struct txq_entry_t to tcp_pending_ack_idx since
this name could be confused index of txq_entry_t. It is index of tcp pending
ack.

It fixes 8e55639d066f4ef402ba88fca08ed1be70e1c4da


It is just a cleanup patch and not a bugfix patch so "fix" is the wrong
word here.  But the correct format for fixes tags is:

Fixes: 123456789012 ('Title of patch')


I see, I learned another one. Thanks.



regards,
dan carpenter



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

[PATCH 09/26] staging: wilc1000: rename u8P2P_vendorspec variable

[Glen Lee]

From: Leo Kim 

This patch renames u8P2P_vendorspec variable to p2p_vendor_spec
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 904b214..0a7226c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -174,7 +174,7 @@ static u8 curr_channel;
 static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};
 static u8 p2p_local_random = 0x01;
 static u8 p2p_recv_random = 0x00;
-static u8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
+static u8 p2p_vendor_spec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
 static bool bWilc_ie;
 
 static struct ieee80211_supported_band WILC_WFI_band_2ghz = {
@@ -2000,7 +2000,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
if 
((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP)) {
if (!bWilc_ie) {
for (i = 
P2P_PUB_ACTION_SUBTYPE; i < size; i++) {
-   if 
(!memcmp(u8P2P_vendorspec, [i], 6)) {
+   if 
(!memcmp(p2p_vendor_spec, [i], 6)) {

p2p_recv_random = buff[i + 6];

bWilc_ie = true;

PRINT_D(GENERIC_DBG, "WILC Vendor specific IE:%02x\n", p2p_recv_random);
@@ -2225,7 +2225,7 @@ static int mgmt_tx(struct wiphy *wiphy,
struct host_if_drv *pstrWFIDrv;
u32 i;
perInterface_wlan_t *nic;
-   u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(p2p_local_random);
+   u32 buf_len = len + sizeof(p2p_vendor_spec) + sizeof(p2p_local_random);
 
nic = netdev_priv(wdev->netdev);
priv = wiphy_priv(wiphy);
@@ -2323,8 +2323,8 @@ static int mgmt_tx(struct wiphy *wiphy,
 * 
Adding WILC information element to allow two WILC devices to
 * 
identify each other and connect
 */
-   
memcpy(_tx->buff[len], u8P2P_vendorspec, sizeof(u8P2P_vendorspec));
-   
mgmt_tx->buff[len + sizeof(u8P2P_vendorspec)] = p2p_local_random;
+   
memcpy(_tx->buff[len], p2p_vendor_spec, sizeof(p2p_vendor_spec));
+   
mgmt_tx->buff[len + sizeof(p2p_vendor_spec)] = p2p_local_random;

mgmt_tx->size = buf_len;
}
} else {
-- 
1.9.1

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

[PATCH 15/26] staging: wilc1000: rename bDirectScan in refresh_scan function

[Glen Lee]

From: Leo Kim 

This patch renames bDirectScan to direct_scan that is
third argument of refresh_scan function to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e987e78..6f79662 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -237,7 +237,7 @@ static u32 get_rssi_avg(tstrNetworkInfo *pstrNetworkInfo)
return rssi_v;
 }
 
-static void refresh_scan(void *user_void, u8 all, bool bDirectScan)
+static void refresh_scan(void *user_void, u8 all, bool direct_scan)
 {
struct wilc_priv *priv;
struct wiphy *wiphy;
@@ -263,7 +263,8 @@ static void refresh_scan(void *user_void, u8 all, bool 
bDirectScan)
channel = ieee80211_get_channel(wiphy, s32Freq);
 
rssi = get_rssi_avg(pstrNetworkInfo);
-   if (memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 
7) || bDirectScan)  {
+   if (memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 
7) ||
+   direct_scan) {
bss = cfg80211_inform_bss(wiphy, 
channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, 
pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,
  
pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,
  
(size_t)pstrNetworkInfo->u16IEsLen, (((s32)rssi) * 100), GFP_KERNEL);
-- 
1.9.1

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

[PATCH 11/26] staging: wilc1000: rename duringIP_TIME variable

[Glen Lee]

From: Leo Kim 

This patch renames duringIP_TIME variable to during_ip_time
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 24e1e15..c49b989 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -200,7 +200,7 @@ static bool g_gtk_keys_saved;
 static bool g_wep_keys_saved;
 
 #define AGING_TIME (9 * 1000)
-#define duringIP_TIME 15000
+#define during_ip_time 15000
 
 static void clear_shadow_scan(void *pUserVoid)
 {
@@ -2772,7 +2772,8 @@ static int change_virtual_intf(struct wiphy *wiphy, 
struct net_device *dev,
PRINT_D(GENERIC_DBG, "start duringIP timer\n");
 
wilc_optaining_ip = true;
-   mod_timer(_during_ip_timer, jiffies + 
msecs_to_jiffies(duringIP_TIME));
+   mod_timer(_during_ip_timer,
+ jiffies + msecs_to_jiffies(during_ip_time));
wilc_set_power_mgmt(priv->hWILCWFIDrv, 0, 0);
/*Delete block ack has to be the latest config packet*/
/*sent before downloading new FW. This is because it blocks on*/
-- 
1.9.1

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

[PATCH 12/26] staging: wilc1000: rename wilc_connected_SSID variable

[Glen Lee]

From: Leo Kim 

This patch renames wilc_connected_SSID variable to wilc_connected_ssid
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/host_interface.c | 22 +++---
 drivers/staging/wilc1000/host_interface.h |  2 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/wilc1000/host_interface.c 
b/drivers/staging/wilc1000/host_interface.c
index e366366..aae5a03 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -987,7 +987,7 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv,
return result;
 }
 
-u8 wilc_connected_SSID[6] = {0};
+u8 wilc_connected_ssid[6] = {0};
 static s32 Handle_Connect(struct host_if_drv *hif_drv,
  struct connect_attr *pstrHostIFconnectAttr)
 {
@@ -999,7 +999,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
 
PRINT_D(GENERIC_DBG, "Handling connect request\n");
 
-   if (memcmp(pstrHostIFconnectAttr->bssid, wilc_connected_SSID, ETH_ALEN) 
== 0) {
+   if (memcmp(pstrHostIFconnectAttr->bssid, wilc_connected_ssid, ETH_ALEN) 
== 0) {
result = 0;
PRINT_ER("Trying to connect to an already connected AP, Discard 
connect request\n");
return result;
@@ -1212,10 +1212,11 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
PRINT_D(GENERIC_DBG, "send HOST_IF_WAITING_CONN_RESP\n");
 
if (pstrHostIFconnectAttr->bssid) {
-   memcpy(wilc_connected_SSID, pstrHostIFconnectAttr->bssid, 
ETH_ALEN);
-
-   PRINT_D(GENERIC_DBG, "save Bssid = %pM\n", 
pstrHostIFconnectAttr->bssid);
-   PRINT_D(GENERIC_DBG, "save bssid = %pM\n", wilc_connected_SSID);
+   memcpy(wilc_connected_ssid,
+  pstrHostIFconnectAttr->bssid, ETH_ALEN);
+   PRINT_D(GENERIC_DBG, "save Bssid = %pM\n",
+   pstrHostIFconnectAttr->bssid);
+   PRINT_D(GENERIC_DBG, "save bssid = %pM\n", wilc_connected_ssid);
}
 
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, strWIDList,
@@ -1389,7 +1390,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv 
*hif_drv)
hif_drv->usr_conn_req.ies_len = 0;
kfree(hif_drv->usr_conn_req.ies);
 
-   eth_zero_addr(wilc_connected_SSID);
+   eth_zero_addr(wilc_connected_ssid);
 
if (join_req && join_req_drv == hif_drv) {
kfree(join_req);
@@ -1585,11 +1586,10 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv 
*hif_drv,
if ((u8MacStatus == MAC_CONNECTED) &&
(strConnectInfo.u16ConnectStatus != 
SUCCESSFUL_STATUSCODE)) {
PRINT_ER("Received MAC status is MAC_CONNECTED 
while the received status code in Asoc Resp is not SUCCESSFUL_STATUSCODE\n");
-   eth_zero_addr(wilc_connected_SSID);
-
+   eth_zero_addr(wilc_connected_ssid);
} else if (u8MacStatus == MAC_DISCONNECTED){
PRINT_ER("Received MAC status is 
MAC_DISCONNECTED\n");
-   eth_zero_addr(wilc_connected_SSID);
+   eth_zero_addr(wilc_connected_ssid);
}
 
if (hif_drv->usr_conn_req.pu8bssid) {
@@ -2007,7 +2007,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
wilc_optaining_ip = false;
wilc_set_power_mgmt(hif_drv, 0, 0);
 
-   eth_zero_addr(wilc_connected_SSID);
+   eth_zero_addr(wilc_connected_ssid);
 
result = wilc_send_config_pkt(hif_drv->wilc, SET_CFG, , 1,
 get_id_from_handler(hif_drv));
diff --git a/drivers/staging/wilc1000/host_interface.h 
b/drivers/staging/wilc1000/host_interface.h
index 004467c6..4f5300d 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -398,7 +398,7 @@ s32 wilc_get_statistics(struct host_if_drv *hWFIDrv,
 void wilc_resolve_disconnect_aberration(struct host_if_drv *hif_drv);
 
 extern bool wilc_optaining_ip;
-extern u8 wilc_connected_SSID[6];
+extern u8 wilc_connected_ssid[6];
 extern u8 wilc_multicast_mac_addr_list[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
 
 extern int wilc_connecting;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c49b989..718b060 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -588,7 +588,7 @@ static void CfgConnectResult(enum conn_event 
enuConnDisconnEvent,
 *  = SUCCESSFUL_STATUSCODE, while mac status is 
MAC_DISCONNECTED (which 

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

[Kalle Valo]

Hauke Mehrtens  writes:

> On 11/18/2015 03:45 PM, Kalle Valo wrote:
>> 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 
>> ---
>
> I would prefer to remove the brcm80211 directory in this process and create:
> drivers/net/wireless/broadcom/brcmfmac
> drivers/net/wireless/broadcom/brcmsmac
> drivers/net/wireless/broadcom/brcmutil
> drivers/net/wireless/broadcom/include
>
> This way we have one directory less.

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

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

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/4] staging: wilc1000: remove define COMPLEMENT_BOOT

[glen lee]

On 2015년 11월 19일 15:19, Dan Carpenter wrote:

On Thu, Nov 19, 2015 at 11:05:58AM +0900, Glen Lee wrote:

This patch removes define COMPLEMENT_BOOT in Makefile. The feature was removed
by the following commit but the define was not removed. So remove completely.

b46d68825c2d3af70ad18b53dfed6516e393b7fa

Put some human readable text next to the hash.  The standard thing is to
include only the first 12 characters of the hash.  If there are fewer
than 12 characters then we could get collisions but including the whole
hash is excessive.


Ok, I understand. Thank you for your advise.

regards,
glen lee



This patch removes define COMPLEMENT_BOOT in Makefile. The feature was
removed by commit b46d68825c2d ('staging: wilc1000: remove
COMPLEMENT_BOOT') but the define was not removed. So remove completely.

regards,
dan carpenter



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

Re: [PATCH 3/4] staging: wilc1000: rename index to tcp_pending_ack_idx

[Dan Carpenter]

On Thu, Nov 19, 2015 at 11:06:00AM +0900, Glen Lee wrote:
> This patch renames "index" of struct txq_entry_t to tcp_pending_ack_idx since
> this name could be confused index of txq_entry_t. It is index of tcp pending
> ack.
> 
> It fixes 8e55639d066f4ef402ba88fca08ed1be70e1c4da
> 

It is just a cleanup patch and not a bugfix patch so "fix" is the wrong
word here.  But the correct format for fixes tags is:

Fixes: 123456789012 ('Title of patch')

regards,
dan carpenter

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

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

[Kalle Valo]

Florian Fainelli  writes:

> On 18/11/15 11:19, Hauke Mehrtens wrote:
>> On 11/18/2015 03:45 PM, Kalle Valo wrote:
>>> 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 
>>> ---
>> 
>> I would prefer to remove the brcm80211 directory in this process and create:
>> drivers/net/wireless/broadcom/brcmfmac
>> drivers/net/wireless/broadcom/brcmsmac
>> drivers/net/wireless/broadcom/brcmutil
>> drivers/net/wireless/broadcom/include
>> 
>> This way we have one directory less.
>
> Would not that make keeping track of the previous and future history
> harder for people contributing to these drivers? I could imagine that
> for Arend and other Broadcom engineers, dealing with a simple level move
> would be manageable, but having to account for a different directory
> hierarchy could be a pain.
>
> What is the impact on compat-wireless after/before these changes by the way?

It's called backports nowadays :)

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

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: State of indoor navigation (11MC) in wireless core API

[Grumbach, Emmanuel]

Hi Anatol,

> 
> Hi
> 
> There is huge interest both from hardwire and software vendors in using
> Indoor Navigation at mobile devices. We are interested in making the
> ChromeOS ecosystem using this feature as well.
> 
> I checked how Android implements indoor navigation where it is used for a
> while. It defines its custom API called Round-trip time [1].
> Broadcom chips firmware implements 11MC draft for this.
> 
> I looked at current Linux tree and do not see any standard API for this
> feature. iwlwifi/mvm/debugfs-vif.c file mentions "Time of Flight"
> that seems 11MC related. Though this driver uses debugfs to communicate
> with the driver. It does not sound like a best way to do it. I would expect a
> callback in cfg80211 interface. Does anybody work on more conventional API
> for this 11MC feature?

Yes we are. Patches are under review internally and should be posted soon.
The debugfs interface was implemented when things were not quite clear on
how the interface should really look like and served as an enabler to the 
firmware
team (since this feature is mainly a firmware feature). We are now in 
transition phase
and move all that to proper nl80211 APIs that will be published upstream soon.

> 
> I expect that many wireless chips are going to implement 11MC in the
> nearest future. Having such clean API from the start will simplify the feature
> development.

Nobody can disagree on that :)

> 
> [1]
> https://android.googlesource.com/platform/hardware/libhardware_legacy/
> +/master/include/hardware_legacy/rtt.h
N�r��yb�X��ǧv�^�)޺{.n�+{��*ޕ�,�{ay�ʇڙ�,j��f���h���z��w���
���j:+v���w�j�mzZ+�ݢj"��!�i

[PATCH 13/26] staging: wilc1000: clear_shadow_scan: remove unused argument

[Glen Lee]

From: Leo Kim 

This patch removes pUserVoid that is first argument of
clear_shadow_scan function because it is not used in this function.
Remove argument in the function call also.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 718b060..e72608b 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -202,7 +202,7 @@ static bool g_wep_keys_saved;
 #define AGING_TIME (9 * 1000)
 #define during_ip_time 15000
 
-static void clear_shadow_scan(void *pUserVoid)
+static void clear_shadow_scan(void)
 {
int i;
 
@@ -3523,7 +3523,7 @@ int wilc_deinit_host_int(struct net_device *net)
s32Error = wilc_deinit(priv->hWILCWFIDrv);
 
/* Clear the Shadow scan */
-   clear_shadow_scan(priv);
+   clear_shadow_scan();
if (op_ifcs == 0) {
PRINT_D(CORECONFIG_DBG, "destroy during ip\n");
del_timer_sync(_during_ip_timer);
-- 
1.9.1

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

[PATCH 16/26] staging: wilc1000: rename pstrNetworkInfo variable

[Glen Lee]

From: Leo Kim 

This patch renames pstrNetworkInfo variable to network_info
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6f79662..9416644 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -249,25 +249,24 @@ static void refresh_scan(void *user_void, u8 all, bool 
direct_scan)
wiphy = priv->dev->ieee80211_ptr->wiphy;
 
for (i = 0; i < last_scanned_cnt; i++) {
-   tstrNetworkInfo *pstrNetworkInfo;
+   tstrNetworkInfo *network_info;
 
-   pstrNetworkInfo = _scanned_shadow[i];
+   network_info = _scanned_shadow[i];
 
-   if ((!pstrNetworkInfo->u8Found) || all) {
+   if (!network_info->u8Found || all) {
s32 s32Freq;
struct ieee80211_channel *channel;
 
-   if (pstrNetworkInfo != NULL) {
-
-   s32Freq = 
ieee80211_channel_to_frequency((s32)pstrNetworkInfo->u8channel, 
IEEE80211_BAND_2GHZ);
+   if (network_info) {
+   s32Freq = 
ieee80211_channel_to_frequency((s32)network_info->u8channel, 
IEEE80211_BAND_2GHZ);
channel = ieee80211_get_channel(wiphy, s32Freq);
 
-   rssi = get_rssi_avg(pstrNetworkInfo);
-   if (memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 
7) ||
+   rssi = get_rssi_avg(network_info);
+   if (memcmp("DIRECT-", network_info->au8ssid, 7) 
||
direct_scan) {
-   bss = cfg80211_inform_bss(wiphy, 
channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, 
pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,
- 
pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,
- 
(size_t)pstrNetworkInfo->u16IEsLen, (((s32)rssi) * 100), GFP_KERNEL);
+   bss = cfg80211_inform_bss(wiphy, 
channel, CFG80211_BSS_FTYPE_UNKNOWN, network_info->au8bssid, 
network_info->u64Tsf, network_info->u16CapInfo,
+ 
network_info->u16BeaconPeriod, (const u8 *)network_info->pu8IEs,
+ 
(size_t)network_info->u16IEsLen, (((s32)rssi) * 100), GFP_KERNEL);
cfg80211_put_bss(wiphy, bss);
}
}
-- 
1.9.1

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

[PATCH 19/26] staging: wilc1000: update_scan_time: remove unused argument

[Glen Lee]

From: Leo Kim 

This patch removes pUserVoid that is first argument of
update_scan_time function because it is not used in this function.
Remove argument in the function call also.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5032705..56005f6 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -284,7 +284,7 @@ static void reset_shadow_found(void)
last_scanned_shadow[i].u8Found = 0;
 }
 
-static void update_scan_time(void *pUserVoid)
+static void update_scan_time(void)
 {
int i;
 
@@ -523,8 +523,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, 
tstrNetworkInfo *pstrNet
 
PRINT_D(CFG80211_DBG, "Scan Aborted\n");
if (priv->pstrScanReq != NULL) {
-
-   update_scan_time(priv);
+   update_scan_time();
refresh_scan(priv, 1, false);
 
cfg80211_scan_done(priv->pstrScanReq, false);
-- 
1.9.1

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

[PATCH 25/26] staging: wilc1000: rename pJoinParams in CfgScanResult function

[Glen Lee]

From: Leo Kim 

This patch renames pJoinParams to join_params that is
fourth argument of CfgScanResult function to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0b03e54..a429167 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -422,7 +422,7 @@ static void add_network_to_shadow(tstrNetworkInfo 
*pstrNetworkInfo,
 static void CfgScanResult(enum scan_event scan_event,
  tstrNetworkInfo *network_info,
  void *user_void,
- void *pJoinParams)
+ void *join_params)
 {
struct wilc_priv *priv;
struct wiphy *wiphy;
@@ -461,12 +461,9 @@ static void CfgScanResult(enum scan_event scan_event,
PRINT_D(CFG80211_DBG, "Network 
%s found\n", network_info->au8ssid);
priv->u32RcvdChCount++;
 
-
-
-   if (pJoinParams == NULL) {
+   if (!join_params)

PRINT_INFO(CORECONFIG_DBG, ">> Something really bad happened\n");
-   }
-   
add_network_to_shadow(network_info, priv, pJoinParams);
+   
add_network_to_shadow(network_info, priv, join_params);
 
/*P2P peers are sent to WPA 
supplicant and added to shadow table*/
if (!(memcmp("DIRECT-", 
network_info->au8ssid, 7))) {
-- 
1.9.1

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

[PATCH 20/26] staging: wilc1000: rename pUserVoid in is_network_in_shadow function

[Glen Lee]

From: Leo Kim 

This patch renames pUserVoid to user_void that is
second argument of is_network_in_shadow function to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 56005f6..5a9d0e2 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -330,14 +330,15 @@ static void clear_duringIP(unsigned long arg)
wilc_optaining_ip = false;
 }
 
-static int is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo, void 
*pUserVoid)
+static int is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo,
+   void *user_void)
 {
int state = -1;
int i;
 
if (last_scanned_cnt == 0) {
PRINT_D(CFG80211_DBG, "Starting Aging timer\n");
-   hAgingTimer.data = (unsigned long)pUserVoid;
+   hAgingTimer.data = (unsigned long)user_void;
mod_timer(, jiffies + msecs_to_jiffies(AGING_TIME));
state = -1;
} else {
-- 
1.9.1

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

[PATCH 23/26] staging: wilc1000: rename pstrNetworkInfo in CfgScanResult function

[Glen Lee]

From: Leo Kim 

This patch renames pstrNetworkInfo to network_info that is
second argument of CfgScanResult function to avoid camelcase.
And, remove the relation comment.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 41 ++-
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 646beff..b0d1ed3 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -420,7 +420,7 @@ static void add_network_to_shadow(tstrNetworkInfo 
*pstrNetworkInfo,
  *  @version   1.0
  */
 static void CfgScanResult(enum scan_event scan_event,
- tstrNetworkInfo *pstrNetworkInfo,
+ tstrNetworkInfo *network_info,
  void *pUserVoid,
  void *pJoinParams)
 {
@@ -438,33 +438,27 @@ static void CfgScanResult(enum scan_event scan_event,
if (!wiphy)
return;
 
-   if (wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC
-   &&
-   s32)pstrNetworkInfo->s8rssi) * 100) < 0
-||
-(((s32)pstrNetworkInfo->s8rssi) * 100) > 100)
-   ) {
+   if (wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC &&
+   (((s32)network_info->s8rssi * 100) < 0 ||
+   ((s32)network_info->s8rssi * 100) > 100)) {
PRINT_ER("wiphy signal type fial\n");
return;
}
 
-   if (pstrNetworkInfo != NULL) {
-   s32Freq = 
ieee80211_channel_to_frequency((s32)pstrNetworkInfo->u8channel, 
IEEE80211_BAND_2GHZ);
+   if (network_info) {
+   s32Freq = 
ieee80211_channel_to_frequency((s32)network_info->u8channel, 
IEEE80211_BAND_2GHZ);
channel = ieee80211_get_channel(wiphy, s32Freq);
 
if (!channel)
return;
 
PRINT_INFO(CFG80211_DBG, "Network Info:: 
CHANNEL Frequency: %d, RSSI: %d, CapabilityInfo: %d,"
-  "BeaconPeriod: %d\n", 
channel->center_freq, (((s32)pstrNetworkInfo->s8rssi) * 100),
-  pstrNetworkInfo->u16CapInfo, 
pstrNetworkInfo->u16BeaconPeriod);
+  "BeaconPeriod: %d\n", 
channel->center_freq, (((s32)network_info->s8rssi) * 100),
+  network_info->u16CapInfo, 
network_info->u16BeaconPeriod);
 
-   if (pstrNetworkInfo->bNewNetwork) {
+   if (network_info->bNewNetwork) {
if (priv->u32RcvdChCount < 
MAX_NUM_SCANNED_NETWORKS) { /* TODO: mostafa: to be replaced by */
-   /*   max_scan_ssids 
*/
-   PRINT_D(CFG80211_DBG, "Network 
%s found\n", pstrNetworkInfo->au8ssid);
-
-
+   PRINT_D(CFG80211_DBG, "Network 
%s found\n", network_info->au8ssid);
priv->u32RcvdChCount++;
 
 
@@ -472,14 +466,13 @@ static void CfgScanResult(enum scan_event scan_event,
if (pJoinParams == NULL) {

PRINT_INFO(CORECONFIG_DBG, ">> Something really bad happened\n");
}
-   
add_network_to_shadow(pstrNetworkInfo, priv, pJoinParams);
+   
add_network_to_shadow(network_info, priv, pJoinParams);
 
/*P2P peers are sent to WPA 
supplicant and added to shadow table*/
-
-   if (!(memcmp("DIRECT-", 
pstrNetworkInfo->au8ssid, 7))) {
-   bss = 
cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN,  
pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,
-   
  pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,
-   
  (size_t)pstrNetworkInfo->u16IEsLen, (((s32)pstrNetworkInfo->s8rssi) * 100), 
GFP_KERNEL);
+

[PATCH 22/26] staging: wilc1000: rename enuScanEvent in CfgScanResult function

[Glen Lee]

From: Leo Kim 

This patch renames enuScanEvent to scan_event that is
first argument of CfgScanResult function to avoid camelcase.
And, remove the relation comment.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 7905f37..646beff 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -419,7 +419,10 @@ static void add_network_to_shadow(tstrNetworkInfo 
*pstrNetworkInfo,
  *  @date
  *  @version   1.0
  */
-static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo 
*pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
+static void CfgScanResult(enum scan_event scan_event,
+ tstrNetworkInfo *pstrNetworkInfo,
+ void *pUserVoid,
+ void *pJoinParams)
 {
struct wilc_priv *priv;
struct wiphy *wiphy;
@@ -429,7 +432,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, 
tstrNetworkInfo *pstrNet
 
priv = (struct wilc_priv *)pUserVoid;
if (priv->bCfgScanning) {
-   if (enuScanEvent == SCAN_EVENT_NETWORK_FOUND) {
+   if (scan_event == SCAN_EVENT_NETWORK_FOUND) {
wiphy = priv->dev->ieee80211_ptr->wiphy;
 
if (!wiphy)
@@ -498,7 +501,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, 
tstrNetworkInfo *pstrNet
}
}
}
-   } else if (enuScanEvent == SCAN_EVENT_DONE){
+   } else if (scan_event == SCAN_EVENT_DONE) {
PRINT_D(CFG80211_DBG, "Scan Done[%p]\n", priv->dev);
PRINT_D(CFG80211_DBG, "Refreshing Scan ...\n");
refresh_scan(priv, 1, false);
@@ -517,10 +520,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, 
tstrNetworkInfo *pstrNet
priv->pstrScanReq = NULL;
}
up(&(priv->hSemScanReq));
-
-   }
-   /*Aborting any scan operation during mac close*/
-   else if (enuScanEvent == SCAN_EVENT_ABORTED) {
+   } else if (scan_event == SCAN_EVENT_ABORTED) {
down(&(priv->hSemScanReq));
 
PRINT_D(CFG80211_DBG, "Scan Aborted\n");
-- 
1.9.1

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

[PATCH 18/26] staging: wilc1000: reset_shadow_found: remove unused argument

[Glen Lee]

From: Leo Kim 

This patch removes pUserVoid that is first argument of
reset_shadow_found function because it is not used in this function.
Remove argument in the function call also.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 55cf444..5032705 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -276,7 +276,7 @@ static void refresh_scan(void *user_void, u8 all, bool 
direct_scan)
 
 }
 
-static void reset_shadow_found(void *pUserVoid)
+static void reset_shadow_found(void)
 {
int i;
 
@@ -731,9 +731,7 @@ static int scan(struct wiphy *wiphy, struct 
cfg80211_scan_request *request)
priv->u32RcvdChCount = 0;
 
wilc_set_wfi_drv_handler(priv->hWILCWFIDrv);
-
-
-   reset_shadow_found(priv);
+   reset_shadow_found();
 
priv->bCfgScanning = true;
if (request->n_channels <= MAX_NUM_SCANNED_NETWORKS) { /* TODO: 
mostafa: to be replaced by */
-- 
1.9.1

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

[PATCH 10/26] staging: wilc1000: rename bWilc_ie variable

[Glen Lee]

From: Leo Kim 

This patch renames bWilc_ie variable to wilc_ie to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0a7226c..24e1e15 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -175,7 +175,7 @@ static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};
 static u8 p2p_local_random = 0x01;
 static u8 p2p_recv_random = 0x00;
 static u8 p2p_vendor_spec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
-static bool bWilc_ie;
+static bool wilc_ie;
 
 static struct ieee80211_supported_band WILC_WFI_band_2ghz = {
.channels = ieee80211_2ghz_channels,
@@ -643,7 +643,7 @@ static void CfgConnectResult(enum conn_event 
enuConnDisconnEvent,
 pstrDisconnectNotifInfo->u16reason, priv->dev);
p2p_local_random = 0x01;
p2p_recv_random = 0x00;
-   bWilc_ie = false;
+   wilc_ie = false;
eth_zero_addr(priv->au8AssociatedBss);
wilc_wlan_set_bssid(priv->dev, NullBssid);
eth_zero_addr(wilc_connected_SSID);
@@ -1073,7 +1073,7 @@ static int disconnect(struct wiphy *wiphy, struct 
net_device *dev, u16 reason_co
 
p2p_local_random = 0x01;
p2p_recv_random = 0x00;
-   bWilc_ie = false;
+   wilc_ie = false;
pstrWFIDrv->p2p_timeout = 0;
 
s32Error = wilc_disconnect(priv->hWILCWFIDrv, reason_code);
@@ -1998,11 +1998,11 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
case PUBLIC_ACT_VENDORSPEC:
if (!memcmp(p2p_oui, 
[ACTION_SUBTYPE_ID + 1], 4)) {
if 
((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP)) {
-   if (!bWilc_ie) {
+   if (!wilc_ie) {
for (i = 
P2P_PUB_ACTION_SUBTYPE; i < size; i++) {
if 
(!memcmp(p2p_vendor_spec, [i], 6)) {

p2p_recv_random = buff[i + 6];
-   
bWilc_ie = true;
+   
wilc_ie = true;

PRINT_D(GENERIC_DBG, "WILC Vendor specific IE:%02x\n", p2p_recv_random);

break;
}
@@ -2025,7 +2025,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
}
 
 
-   if ((buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP) && (bWilc_ie))   {
+   if ((buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP) && (wilc_ie)){
PRINT_D(GENERIC_DBG, "Sending 
P2P to host without extra elemnt\n");
/* extra attribute for sig_dbm: 
signal strength in mBm, or 0 if unknown */
cfg80211_rx_mgmt(priv->wdev, 
s32Freq, 0, buff, size - 7, 0);
@@ -2560,9 +2560,7 @@ static int change_virtual_intf(struct wiphy *wiphy, 
struct net_device *dev,
PRINT_D(HOSTAPD_DBG, "Wireless interface name =%s\n", dev->name);
p2p_local_random = 0x01;
p2p_recv_random = 0x00;
-
-   bWilc_ie = false;
-
+   wilc_ie = false;
wilc_optaining_ip = false;
del_timer(_during_ip_timer);
PRINT_D(GENERIC_DBG, "Changing virtual interface, enable scan\n");
-- 
1.9.1

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

[PATCH 24/26] staging: wilc1000: rename pUserVoid in CfgScanResult function

[Glen Lee]

From: Leo Kim 

This patch renames pUserVoid to user_void that is
third argument of CfgScanResult function to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index b0d1ed3..0b03e54 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -421,7 +421,7 @@ static void add_network_to_shadow(tstrNetworkInfo 
*pstrNetworkInfo,
  */
 static void CfgScanResult(enum scan_event scan_event,
  tstrNetworkInfo *network_info,
- void *pUserVoid,
+ void *user_void,
  void *pJoinParams)
 {
struct wilc_priv *priv;
@@ -430,7 +430,7 @@ static void CfgScanResult(enum scan_event scan_event,
struct ieee80211_channel *channel;
struct cfg80211_bss *bss = NULL;
 
-   priv = (struct wilc_priv *)pUserVoid;
+   priv = (struct wilc_priv *)user_void;
if (priv->bCfgScanning) {
if (scan_event == SCAN_EVENT_NETWORK_FOUND) {
wiphy = priv->dev->ieee80211_ptr->wiphy;
-- 
1.9.1

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

[PATCH 02/26] staging: wilc1000: rename astrLastScannedNtwrksShadow variable

[Glen Lee]

From: Leo Kim 

This patch renames astrLastScannedNtwrksShadow variable to last_scanned_shadow
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 124 ++
 1 file changed, 58 insertions(+), 66 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 97848e4..32cc734 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -106,7 +106,7 @@ static const struct ieee80211_txrx_stypes
 extern int wilc_mac_open(struct net_device *ndev);
 extern int wilc_mac_close(struct net_device *ndev);
 
-static tstrNetworkInfo 
astrLastScannedNtwrksShadow[MAX_NUM_SCANNED_NETWORKS_SHADOW];
+static tstrNetworkInfo last_scanned_shadow[MAX_NUM_SCANNED_NETWORKS_SHADOW];
 static u32 last_scanned_cnt;
 struct timer_list wilc_during_ip_timer;
 static struct timer_list hAgingTimer;
@@ -214,13 +214,13 @@ static void clear_shadow_scan(void *pUserVoid)
PRINT_INFO(CORECONFIG_DBG, "destroy aging timer\n");
 
for (i = 0; i < last_scanned_cnt; i++) {
-   if 
(astrLastScannedNtwrksShadow[last_scanned_cnt].pu8IEs != NULL) {
-   kfree(astrLastScannedNtwrksShadow[i].pu8IEs);
-   
astrLastScannedNtwrksShadow[last_scanned_cnt].pu8IEs = NULL;
+   if (last_scanned_shadow[last_scanned_cnt].pu8IEs) {
+   kfree(last_scanned_shadow[i].pu8IEs);
+   last_scanned_shadow[last_scanned_cnt].pu8IEs = 
NULL;
}
 
-   
wilc_free_join_params(astrLastScannedNtwrksShadow[i].pJoinParams);
-   astrLastScannedNtwrksShadow[i].pJoinParams = NULL;
+   
wilc_free_join_params(last_scanned_shadow[i].pJoinParams);
+   last_scanned_shadow[i].pJoinParams = NULL;
}
last_scanned_cnt = 0;
}
@@ -254,8 +254,7 @@ static void refresh_scan(void *pUserVoid, u8 all, bool 
bDirectScan)
for (i = 0; i < last_scanned_cnt; i++) {
tstrNetworkInfo *pstrNetworkInfo;
 
-   pstrNetworkInfo = &(astrLastScannedNtwrksShadow[i]);
-
+   pstrNetworkInfo = _scanned_shadow[i];
 
if ((!pstrNetworkInfo->u8Found) || all) {
s32 s32Freq;
@@ -285,7 +284,7 @@ static void reset_shadow_found(void *pUserVoid)
int i;
 
for (i = 0; i < last_scanned_cnt; i++)
-   astrLastScannedNtwrksShadow[i].u8Found = 0;
+   last_scanned_shadow[i].u8Found = 0;
 }
 
 static void update_scan_time(void *pUserVoid)
@@ -293,7 +292,7 @@ static void update_scan_time(void *pUserVoid)
int i;
 
for (i = 0; i < last_scanned_cnt; i++)
-   astrLastScannedNtwrksShadow[i].u32TimeRcvdInScan = jiffies;
+   last_scanned_shadow[i].u32TimeRcvdInScan = jiffies;
 }
 
 static void remove_network_from_shadow(unsigned long arg)
@@ -303,16 +302,16 @@ static void remove_network_from_shadow(unsigned long arg)
 
 
for (i = 0; i < last_scanned_cnt; i++) {
-   if (time_after(now, 
astrLastScannedNtwrksShadow[i].u32TimeRcvdInScan + (unsigned 
long)(SCAN_RESULT_EXPIRE))) {
-   PRINT_D(CFG80211_DBG, "Network expired in ScanShadow: 
%s\n", astrLastScannedNtwrksShadow[i].au8ssid);
+   if (time_after(now, last_scanned_shadow[i].u32TimeRcvdInScan + 
(unsigned long)(SCAN_RESULT_EXPIRE))) {
+   PRINT_D(CFG80211_DBG, "Network expired in ScanShadow: 
%s\n", last_scanned_shadow[i].au8ssid);
 
-   kfree(astrLastScannedNtwrksShadow[i].pu8IEs);
-   astrLastScannedNtwrksShadow[i].pu8IEs = NULL;
+   kfree(last_scanned_shadow[i].pu8IEs);
+   last_scanned_shadow[i].pu8IEs = NULL;
 
-   
wilc_free_join_params(astrLastScannedNtwrksShadow[i].pJoinParams);
+   
wilc_free_join_params(last_scanned_shadow[i].pJoinParams);
 
for (j = i; (j < last_scanned_cnt - 1); j++)
-   astrLastScannedNtwrksShadow[j] = 
astrLastScannedNtwrksShadow[j + 1];
+   last_scanned_shadow[j] = last_scanned_shadow[j 
+ 1];
 
last_scanned_cnt--;
}
@@ -347,8 +346,8 @@ static int is_network_in_shadow(tstrNetworkInfo 
*pstrNetworkInfo, void *pUserVoi
} else {
/* Linear search for now */
for (i = 0; i < last_scanned_cnt; i++) {
-   if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid,
-   pstrNetworkInfo->au8bssid, 6) == 0) {
+

[PATCH 03/26] staging: wilc1000: rename WILC_WFI_2ghz_channels variable

[Glen Lee]

From: Leo Kim 

This patch renames WILC_WFI_2ghz_channels variable to ieee80211_2ghz_channels
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 32cc734..349b720 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -124,7 +124,7 @@ u8 wilc_initialized = 1;
 }
 
 /*Frequency range for channels*/
-static struct ieee80211_channel WILC_WFI_2ghz_channels[] = {
+static struct ieee80211_channel ieee80211_2ghz_channels[] = {
CHAN2G(1,  2412, 0),
CHAN2G(2,  2417, 0),
CHAN2G(3,  2422, 0),
@@ -181,8 +181,8 @@ static u8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 
0x40, 0x03};
 static bool bWilc_ie;
 
 static struct ieee80211_supported_band WILC_WFI_band_2ghz = {
-   .channels = WILC_WFI_2ghz_channels,
-   .n_channels = ARRAY_SIZE(WILC_WFI_2ghz_channels),
+   .channels = ieee80211_2ghz_channels,
+   .n_channels = ARRAY_SIZE(ieee80211_2ghz_channels),
.bitrates = WILC_WFI_rates,
.n_bitrates = ARRAY_SIZE(WILC_WFI_rates),
 };
-- 
1.9.1

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

[PATCH 05/26] staging: wilc1000: rename u8WLANChannel variable

[Glen Lee]

From: Leo Kim 

This patch renames u8WLANChannel variable to wlan_channel to avoid camelcase.
And, remove the relation comment.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 29 +--
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index c2e7bf8..3b072ef 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -169,9 +169,7 @@ struct p2p_mgmt_data {
u8 *buff;
 };
 
-/*Global variable used to state the current  connected STA channel*/
-static u8 u8WLANChannel = INVALID_CHANNEL;
-
+static u8 wlan_channel = INVALID_CHANNEL;
 static u8 curr_channel;
 
 static u8 u8P2P_oui[] = {0x50, 0x6f, 0x9A, 0x09};
@@ -593,9 +591,8 @@ static void CfgConnectResult(enum conn_event 
enuConnDisconnEvent,
wilc_wlan_set_bssid(priv->dev, NullBssid);
eth_zero_addr(wilc_connected_SSID);
 
-   /*Invalidate u8WLANChannel value on wlan0 disconnect*/
if (!pstrWFIDrv->p2p_connect)
-   u8WLANChannel = INVALID_CHANNEL;
+   wlan_channel = INVALID_CHANNEL;
 
PRINT_ER("Unspecified failure: Connection status %d : 
MAC status = %d\n", u16ConnectStatus, u8MacStatus);
}
@@ -652,9 +649,8 @@ static void CfgConnectResult(enum conn_event 
enuConnDisconnEvent,
wilc_wlan_set_bssid(priv->dev, NullBssid);
eth_zero_addr(wilc_connected_SSID);
 
-   /*Invalidate u8WLANChannel value on wlan0 disconnect*/
if (!pstrWFIDrv->p2p_connect)
-   u8WLANChannel = INVALID_CHANNEL;
+   wlan_channel = INVALID_CHANNEL;
/*Incase "P2P CLIENT Connected" send deauthentication reason by 
3 to force the WPA_SUPPLICANT to directly change
 *  virtual interface to station*/
if ((pstrWFIDrv->IFC_UP) && (dev == wl->vif[1].ndev)) {
@@ -1029,7 +1025,7 @@ static int connect(struct wiphy *wiphy, struct net_device 
*dev,
curr_channel = pstrNetworkInfo->u8channel;
 
if (!pstrWFIDrv->p2p_connect)
-   u8WLANChannel = pstrNetworkInfo->u8channel;
+   wlan_channel = pstrNetworkInfo->u8channel;
 
wilc_wlan_set_bssid(dev, pstrNetworkInfo->au8bssid);
 
@@ -1069,10 +1065,9 @@ static int disconnect(struct wiphy *wiphy, struct 
net_device *dev, u16 reason_co
wilc_connecting = 0;
priv = wiphy_priv(wiphy);
 
-   /*Invalidate u8WLANChannel value on wlan0 disconnect*/
pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (!pstrWFIDrv->p2p_connect)
-   u8WLANChannel = INVALID_CHANNEL;
+   wlan_channel = INVALID_CHANNEL;
wilc_wlan_set_bssid(priv->dev, NullBssid);
 
PRINT_D(CFG80211_DBG, "Disconnecting with reason code(%d)\n", 
reason_code);
@@ -1855,15 +1850,14 @@ static void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len)
op_channel_attr_index = index;
index += buf[index + 1] + 3; /* ID,Length byte */
}
-   if (u8WLANChannel != INVALID_CHANNEL) {
-
+   if (wlan_channel != INVALID_CHANNEL) {
/*Modify channel list attribute*/
if (channel_list_attr_index) {
PRINT_D(GENERIC_DBG, "Modify channel list attribute\n");
for (i = channel_list_attr_index + 3; i < 
((channel_list_attr_index + 3) + buf[channel_list_attr_index + 1]); i++) {
if (buf[i] == 0x51) {
for (j = i + 2; j < ((i + 2) + buf[i + 
1]); j++) {
-   buf[j] = u8WLANChannel;
+   buf[j] = wlan_channel;
}
break;
}
@@ -1873,7 +1867,7 @@ static void WILC_WFI_CfgParseRxAction(u8 *buf, u32 len)
if (op_channel_attr_index) {
PRINT_D(GENERIC_DBG, "Modify operating channel 
attribute\n");
buf[op_channel_attr_index + 6] = 0x51;
-   buf[op_channel_attr_index + 7] = u8WLANChannel;
+   buf[op_channel_attr_index + 7] = wlan_channel;
}
}
 }
@@ -1909,15 +1903,14 @@ static void WILC_WFI_CfgParseTxAction(u8 *buf, u32 len, 
bool bOperChan, u8 iftyp
op_channel_attr_index = index;
index += buf[index + 1] + 3; /* ID,Length byte */
}
-   if (u8WLANChannel != INVALID_CHANNEL && bOperChan) {
-
+   if (wlan_channel != 

[PATCH 06/26] staging: wilc1000: rename u8P2P_oui variable

[Glen Lee]

From: Leo Kim 

This patch renames u8P2P_oui variable to p2p_oui to avoid camelcase.
And, remove the relation comment.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3b072ef..6ab4a79 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -171,8 +171,7 @@ struct p2p_mgmt_data {
 
 static u8 wlan_channel = INVALID_CHANNEL;
 static u8 curr_channel;
-
-static u8 u8P2P_oui[] = {0x50, 0x6f, 0x9A, 0x09};
+static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};
 static u8 u8P2Plocalrandom = 0x01;
 static u8 u8P2Precvrandom = 0x00;
 static u8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
@@ -1997,9 +1996,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
break;
 
case PUBLIC_ACT_VENDORSPEC:
-   /*Now we have a public action vendor 
specific action frame, check if its a p2p public action frame
-* based on the standard its should 
have the p2p_oui attribute with the following values 50 6f 9A 09*/
-   if (!memcmp(u8P2P_oui, 
[ACTION_SUBTYPE_ID + 1], 4)) {
+   if (!memcmp(p2p_oui, 
[ACTION_SUBTYPE_ID + 1], 4)) {
if 
((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP)) {
if (!bWilc_ie) {
for (i = 
P2P_PUB_ACTION_SUBTYPE; i < size; i++) {
@@ -2016,7 +2013,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
if 
((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP
  || 
buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
P2P_INV_RSP)) {
for (i = 
P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
-   if 
(buff[i] == P2PELEM_ATTR_ID && !(memcmp(u8P2P_oui, [i + 2], 4))) {
+   if 
(buff[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, [i + 2], 4))) {

WILC_WFI_CfgParseRxAction([i + 6], size - (i + 6));

break;
}
@@ -2292,9 +2289,7 @@ static int mgmt_tx(struct wiphy *wiphy,
 
case PUBLIC_ACT_VENDORSPEC:
{
-   /*Now we have a public action vendor 
specific action frame, check if its a p2p public action frame
-* based on the standard its should 
have the p2p_oui attribute with the following values 50 6f 9A 09*/
-   if (!memcmp(u8P2P_oui, 
[ACTION_SUBTYPE_ID + 1], 4)) {
+   if (!memcmp(p2p_oui, 
[ACTION_SUBTYPE_ID + 1], 4)) {
/*For the connection of two 
WILC's connection generate a rand number to determine who will be a GO*/
if 
((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP)) {
if (u8P2Plocalrandom == 
1 && u8P2Precvrandom < u8P2Plocalrandom) {
@@ -2311,7 +2306,7 @@ static int mgmt_tx(struct wiphy *wiphy,
 
/*Search for 
the p2p information information element , after the Public action subtype 
theres a byte for teh dialog token, skip that*/
for (i = 
P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
-   if 
(buf[i] == P2PELEM_ATTR_ID && !(memcmp(u8P2P_oui, [i + 2], 4))) {
+   if 
(buf[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, [i + 2], 4))) {

if (buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] 
== P2P_INV_RSP)
 

[PATCH 01/26] staging: wilc1000: rename u32LastScannedNtwrksCountShadow variable

[Glen Lee]

From: Leo Kim 

This patch renames u32LastScannedNtwrksCountShadow variable to last_scanned_cnt
to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 50 +++
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index cc279c6..97848e4 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -107,7 +107,7 @@ extern int wilc_mac_open(struct net_device *ndev);
 extern int wilc_mac_close(struct net_device *ndev);
 
 static tstrNetworkInfo 
astrLastScannedNtwrksShadow[MAX_NUM_SCANNED_NETWORKS_SHADOW];
-static u32 u32LastScannedNtwrksCountShadow;
+static u32 last_scanned_cnt;
 struct timer_list wilc_during_ip_timer;
 static struct timer_list hAgingTimer;
 static u8 op_ifcs;
@@ -213,16 +213,16 @@ static void clear_shadow_scan(void *pUserVoid)
del_timer_sync();
PRINT_INFO(CORECONFIG_DBG, "destroy aging timer\n");
 
-   for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
-   if 
(astrLastScannedNtwrksShadow[u32LastScannedNtwrksCountShadow].pu8IEs != NULL) {
+   for (i = 0; i < last_scanned_cnt; i++) {
+   if 
(astrLastScannedNtwrksShadow[last_scanned_cnt].pu8IEs != NULL) {
kfree(astrLastScannedNtwrksShadow[i].pu8IEs);
-   
astrLastScannedNtwrksShadow[u32LastScannedNtwrksCountShadow].pu8IEs = NULL;
+   
astrLastScannedNtwrksShadow[last_scanned_cnt].pu8IEs = NULL;
}
 

wilc_free_join_params(astrLastScannedNtwrksShadow[i].pJoinParams);
astrLastScannedNtwrksShadow[i].pJoinParams = NULL;
}
-   u32LastScannedNtwrksCountShadow = 0;
+   last_scanned_cnt = 0;
}
 
 }
@@ -251,7 +251,7 @@ static void refresh_scan(void *pUserVoid, u8 all, bool 
bDirectScan)
priv = (struct wilc_priv *)pUserVoid;
wiphy = priv->dev->ieee80211_ptr->wiphy;
 
-   for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
+   for (i = 0; i < last_scanned_cnt; i++) {
tstrNetworkInfo *pstrNetworkInfo;
 
pstrNetworkInfo = &(astrLastScannedNtwrksShadow[i]);
@@ -284,19 +284,16 @@ static void reset_shadow_found(void *pUserVoid)
 {
int i;
 
-   for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
+   for (i = 0; i < last_scanned_cnt; i++)
astrLastScannedNtwrksShadow[i].u8Found = 0;
-
-   }
 }
 
 static void update_scan_time(void *pUserVoid)
 {
int i;
 
-   for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
+   for (i = 0; i < last_scanned_cnt; i++)
astrLastScannedNtwrksShadow[i].u32TimeRcvdInScan = jiffies;
-   }
 }
 
 static void remove_network_from_shadow(unsigned long arg)
@@ -305,7 +302,7 @@ static void remove_network_from_shadow(unsigned long arg)
int i, j;
 
 
-   for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
+   for (i = 0; i < last_scanned_cnt; i++) {
if (time_after(now, 
astrLastScannedNtwrksShadow[i].u32TimeRcvdInScan + (unsigned 
long)(SCAN_RESULT_EXPIRE))) {
PRINT_D(CFG80211_DBG, "Network expired in ScanShadow: 
%s\n", astrLastScannedNtwrksShadow[i].au8ssid);
 
@@ -314,15 +311,16 @@ static void remove_network_from_shadow(unsigned long arg)
 

wilc_free_join_params(astrLastScannedNtwrksShadow[i].pJoinParams);
 
-   for (j = i; (j < u32LastScannedNtwrksCountShadow - 1); 
j++) {
+   for (j = i; (j < last_scanned_cnt - 1); j++)
astrLastScannedNtwrksShadow[j] = 
astrLastScannedNtwrksShadow[j + 1];
-   }
-   u32LastScannedNtwrksCountShadow--;
+
+   last_scanned_cnt--;
}
}
 
-   PRINT_D(CFG80211_DBG, "Number of cached networks: %d\n", 
u32LastScannedNtwrksCountShadow);
-   if (u32LastScannedNtwrksCountShadow != 0) {
+   PRINT_D(CFG80211_DBG, "Number of cached networks: %d\n",
+   last_scanned_cnt);
+   if (last_scanned_cnt != 0) {
hAgingTimer.data = arg;
mod_timer(, jiffies + msecs_to_jiffies(AGING_TIME));
} else {
@@ -341,14 +339,14 @@ static int is_network_in_shadow(tstrNetworkInfo 
*pstrNetworkInfo, void *pUserVoi
int state = -1;
int i;
 
-   if (u32LastScannedNtwrksCountShadow == 0) {
+   if (last_scanned_cnt == 0) {
PRINT_D(CFG80211_DBG, "Starting Aging timer\n");
hAgingTimer.data = (unsigned long)pUserVoid;

[PATCH 07/26] staging: wilc1000: rename u8P2Plocalrandom variable

[Glen Lee]

From: Leo Kim 

This patch renames u8P2Plocalrandom variable to p2p_local_random
to avoid camelcase.
And, remove the relation comment.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 35 ---
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6ab4a79..dd8d404 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -172,7 +172,7 @@ struct p2p_mgmt_data {
 static u8 wlan_channel = INVALID_CHANNEL;
 static u8 curr_channel;
 static u8 p2p_oui[] = {0x50, 0x6f, 0x9A, 0x09};
-static u8 u8P2Plocalrandom = 0x01;
+static u8 p2p_local_random = 0x01;
 static u8 u8P2Precvrandom = 0x00;
 static u8 u8P2P_vendorspec[] = {0xdd, 0x05, 0x00, 0x08, 0x40, 0x03};
 static bool bWilc_ie;
@@ -641,7 +641,7 @@ static void CfgConnectResult(enum conn_event 
enuConnDisconnEvent,
wilc_optaining_ip = false;
PRINT_ER("Received MAC_DISCONNECTED from firmware with reason 
%d on dev [%p]\n",
 pstrDisconnectNotifInfo->u16reason, priv->dev);
-   u8P2Plocalrandom = 0x01;
+   p2p_local_random = 0x01;
u8P2Precvrandom = 0x00;
bWilc_ie = false;
eth_zero_addr(priv->au8AssociatedBss);
@@ -1071,7 +1071,7 @@ static int disconnect(struct wiphy *wiphy, struct 
net_device *dev, u16 reason_co
 
PRINT_D(CFG80211_DBG, "Disconnecting with reason code(%d)\n", 
reason_code);
 
-   u8P2Plocalrandom = 0x01;
+   p2p_local_random = 0x01;
u8P2Precvrandom = 0x00;
bWilc_ie = false;
pstrWFIDrv->p2p_timeout = 0;
@@ -2009,7 +2009,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
}
}
}
-   if (u8P2Plocalrandom > 
u8P2Precvrandom) {
+   if (p2p_local_random > 
u8P2Precvrandom) {
if 
((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP
  || 
buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == 
P2P_INV_RSP)) {
for (i = 
P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
@@ -2019,8 +2019,9 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, 
u32 size)
}
}
}
-   } else
-   PRINT_D(GENERIC_DBG, 
"PEER WILL BE GO LocaRand=%02x RecvRand %02x\n", u8P2Plocalrandom, 
u8P2Precvrandom);
+   } else {
+   PRINT_D(GENERIC_DBG, 
"PEER WILL BE GO LocaRand=%02x RecvRand %02x\n", p2p_local_random, 
u8P2Precvrandom);
+   }
}
 
 
@@ -2224,7 +2225,7 @@ static int mgmt_tx(struct wiphy *wiphy,
struct host_if_drv *pstrWFIDrv;
u32 i;
perInterface_wlan_t *nic;
-   u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom);
+   u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(p2p_local_random);
 
nic = netdev_priv(wdev->netdev);
priv = wiphy_priv(wiphy);
@@ -2292,17 +2293,16 @@ static int mgmt_tx(struct wiphy *wiphy,
if (!memcmp(p2p_oui, 
[ACTION_SUBTYPE_ID + 1], 4)) {
/*For the connection of two 
WILC's connection generate a rand number to determine who will be a GO*/
if 
((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == 
GO_NEG_RSP)) {
-   if (u8P2Plocalrandom == 
1 && u8P2Precvrandom < u8P2Plocalrandom) {
-   
get_random_bytes(, 1);
-   /*Increment the 
number to prevent if its 0*/
-   
u8P2Plocalrandom++;
+   if (p2p_local_random == 
1 && u8P2Precvrandom < p2p_local_random) {
+

[PATCH 26/26] staging: wilc1000: rename pstrNetworkInfo in get_rssi_avg function

[Glen Lee]

From: Leo Kim 

This patch renames pstrNetworkInfo to network_info that is
first argument of get_rssi_avg function to avoid camelcase.

Signed-off-by: Leo Kim 
Signed-off-by: Glen Lee 
---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c 
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a429167..bcfddbf 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -224,14 +224,14 @@ static void clear_shadow_scan(void)
 
 }
 
-static u32 get_rssi_avg(tstrNetworkInfo *pstrNetworkInfo)
+static u32 get_rssi_avg(tstrNetworkInfo *network_info)
 {
u8 i;
int rssi_v = 0;
-   u8 num_rssi = (pstrNetworkInfo->strRssi.u8Full) ? NUM_RSSI : 
(pstrNetworkInfo->strRssi.u8Index);
+   u8 num_rssi = (network_info->strRssi.u8Full) ? NUM_RSSI : 
(network_info->strRssi.u8Index);
 
for (i = 0; i < num_rssi; i++)
-   rssi_v += pstrNetworkInfo->strRssi.as8RSSI[i];
+   rssi_v += network_info->strRssi.as8RSSI[i];
 
rssi_v /= num_rssi;
return rssi_v;
-- 
1.9.1

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

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

[Emmanuel Grumbach]

Hi Kalle,

On Wed, Nov 18, 2015 at 4:45 PM, Kalle Valo  wrote:
>
> Part of reorganising wireless drivers directory and Kconfig.
>

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

Thank you.

> Signed-off-by: Kalle Valo 
> ---
>  MAINTAINERS|2 +-
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[David Miller]

From: Emmanuel Grumbach 
Date: Wed, 18 Nov 2015 23:21:31 +0200

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

Sorry, that's not a reason to stop this reorganization.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html