Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/cfg80211.c

diff --cc drivers/net/wireless/ath/ath6kl/cfg80211.c
index f00d377,f27e973..fd7dbd4
--- 1/drivers/net/wireless/ath/ath6kl/cfg80211.c
--- 2/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@@ -2650,59 -2585,6 +2650,30 @@@ static int ath6kl_set_ies(struct ath6kl
        return 0;
  }
  
- static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
-                             struct ieee80211_channel *chan,
-                             enum nl80211_channel_type channel_type)
- {
-       struct ath6kl_vif *vif;
- 
-       /*
-        * 'dev' could be NULL if a channel change is required for the hardware
-        * device itself, instead of a particular VIF.
-        *
-        * FIXME: To be handled properly when monitor mode is supported.
-        */
-       if (!dev)
-               return -EBUSY;
- 
-       vif = netdev_priv(dev);
- 
-       if (!ath6kl_cfg80211_ready(vif))
-               return -EIO;
- 
-       ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: center_freq=%u hw_value=%u\n",
-                  __func__, chan->center_freq, chan->hw_value);
-       vif->next_chan = chan->center_freq;
-       vif->next_ch_type = channel_type;
-       vif->next_ch_band = chan->band;
- 
-       return 0;
- }
- 
 +void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable)
 +{
 +      int err;
 +
 +      if (WARN_ON(!test_bit(WMI_READY, &vif->ar->flag)))
 +              return;
 +
 +      if (vif->nw_type != INFRA_NETWORK)
 +              return;
 +
 +      if (!test_bit(ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,
 +                    vif->ar->fw_capabilities))
 +              return;
 +
 +      ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s fw bmiss enhance\n",
 +                 enable ? "enable" : "disable");
 +
 +      err = ath6kl_wmi_sta_bmiss_enhance_cmd(vif->ar->wmi,
 +                                             vif->fw_vif_idx, enable);
 +      if (err)
 +              ath6kl_err("failed to %s enhanced bmiss detection: %d\n",
 +                         enable ? "enable" : "disable", err);
 +}
 +
  static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,
                                u8 *rsn_capab)
  {

diff --cc drivers/net/wireless/ath/ath6kl/core.h
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/main.c
Simple merge