Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmsmac/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/scan.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sta_cmd.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/sta_cmdresp.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/cam.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/net/wireless/ti/wlcore/tx.c
index 9273fdb3aaec1ff34ac7c719f0145aa8986bd0ee,6a28aeecf004db4c9fb553ca33197f0951ae4cd8..8038a5026933125adcc17063bddcc4d9a6e296dd
--- 1/drivers/net/wireless/ti/wlcore/tx.c
--- 2/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@@ -877,15 -910,20 +910,19 @@@ static void wl1271_tx_complete_packet(s
  }
  
  /* Called upon reception of a TX complete interrupt */
- void wl1271_tx_complete(struct wl1271 *wl)
+ int wlcore_tx_complete(struct wl1271 *wl)
  {
 -      struct wl1271_acx_mem_map *memmap =
 -              (struct wl1271_acx_mem_map *)wl->target_mem_map;
 +      struct wl1271_acx_mem_map *memmap = wl->target_mem_map;
        u32 count, fw_counter;
        u32 i;
+       int ret;
  
        /* read the tx results from the chipset */
-       wl1271_read(wl, le32_to_cpu(memmap->tx_result),
-                   wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+       ret = wlcore_read(wl, le32_to_cpu(memmap->tx_result),
+                         wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+       if (ret < 0)
+               goto out;
+ 
        fw_counter = le32_to_cpu(wl->tx_res_if->tx_result_fw_counter);
  
        /* write host counter to chipset (to ack) */

diff --cc net/wireless/nl80211.c
Simple merge