Merge ath-next from ath.git

ath.git patches for 4.7. Major changes:

ath10k

* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)

wil6210

* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter

diff --combined drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index a049f8d34f9964039e62392420ff35d00c312654,36b60257790531c1b69d8c0efd3111a6ac177a1a..f68098284c43be41562b3f126cbe1409134a1868
--- 1/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
--- 2/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@@ -3590,8 -3590,8 +3590,8 @@@ static void ar9003_hw_ant_ctrl_apply(st
                else
                        gpio = AR9300_EXT_LNA_CTL_GPIO_AR9485;
  
-               ath9k_hw_cfg_output(ah, gpio,
-                                   AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED);
+               ath9k_hw_gpio_request_out(ah, gpio, NULL,
+                                         AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED);
        }
  
        value = ar9003_hw_ant_ctrl_common_get(ah, is2ghz);
@@@ -4097,16 -4097,16 +4097,16 @@@ static void ar9003_hw_thermometer_apply
                REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX4,
                              AR_PHY_65NM_CH0_RXTX4_THERM_ON_OVR, therm_on);
  
 -      therm_on = (thermometer < 0) ? 0 : (thermometer == 0);
 +      therm_on = thermometer == 0;
        REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_RXTX4,
                      AR_PHY_65NM_CH0_RXTX4_THERM_ON, therm_on);
        if (pCap->chip_chainmask & BIT(1)) {
 -              therm_on = (thermometer < 0) ? 0 : (thermometer == 1);
 +              therm_on = thermometer == 1;
                REG_RMW_FIELD(ah, AR_PHY_65NM_CH1_RXTX4,
                              AR_PHY_65NM_CH0_RXTX4_THERM_ON, therm_on);
        }
        if (pCap->chip_chainmask & BIT(2)) {
 -              therm_on = (thermometer < 0) ? 0 : (thermometer == 2);
 +              therm_on = thermometer == 2;
                REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX4,
                              AR_PHY_65NM_CH0_RXTX4_THERM_ON, therm_on);
        }

diff --combined drivers/net/wireless/ath/ath9k/init.c
index 1c226d63bb0362d44e3420758909592f08287a12,d986687870afe8e29be372b683d9a5fa109daecb..77ace8d72d5400429ac14242ab51a23568d567fb
--- 1/drivers/net/wireless/ath/ath9k/init.c
--- 2/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@@ -660,7 -660,6 +660,6 @@@ static int ath9k_init_softc(u16 devid, 
  
        ath9k_cmn_init_crypto(sc->sc_ah);
        ath9k_init_misc(sc);
-       ath_fill_led_pin(sc);
        ath_chanctx_init(sc);
        ath9k_offchannel_init(sc);
  
@@@ -848,8 -847,8 +847,8 @@@ static void ath9k_set_hw_capab(struct a
                        hw->wiphy->interface_modes |=
                                        BIT(NL80211_IFTYPE_P2P_DEVICE);
  
 -                      hw->wiphy->iface_combinations = if_comb;
 -                      hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
 +              hw->wiphy->iface_combinations = if_comb;
 +              hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb);
        }
  
        hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;