Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

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

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

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

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

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

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

diff --cc drivers/net/wireless/mwifiex/11n.h
Simple merge

diff --cc drivers/net/wireless/mwifiex/main.h
Simple merge

diff --cc drivers/net/wireless/mwifiex/tdls.c
index 6bef47c,49c8a2c..e14fbb5
--- 1/drivers/net/wireless/mwifiex/tdls.c
--- 2/drivers/net/wireless/mwifiex/tdls.c
+++ b/drivers/net/wireless/mwifiex/tdls.c
@@@ -185,50 -186,8 +186,50 @@@ static int mwifiex_tdls_add_vht_capab(s
        return 0;
  }
  
 +static int
 +mwifiex_tdls_add_ht_oper(struct mwifiex_private *priv, u8 *mac,
 +                       u8 vht_enabled, struct sk_buff *skb)
 +{
 +      struct ieee80211_ht_operation *ht_oper;
 +      struct mwifiex_sta_node *sta_ptr;
 +      struct mwifiex_bssdescriptor *bss_desc =
 +                                      &priv->curr_bss_params.bss_descriptor;
 +      u8 *pos;
 +
 +      sta_ptr = mwifiex_get_sta_entry(priv, mac);
 +      if (unlikely(!sta_ptr)) {
 +              dev_warn(priv->adapter->dev,
 +                       "TDLS peer station not found in list\n");
 +              return -1;
 +      }
 +
 +      pos = (void *)skb_put(skb, sizeof(struct ieee80211_ht_operation) + 2);
 +      *pos++ = WLAN_EID_HT_OPERATION;
 +      *pos++ = sizeof(struct ieee80211_ht_operation);
 +      ht_oper = (void *)pos;
 +
 +      ht_oper->primary_chan = bss_desc->channel;
 +
 +      /* follow AP's channel bandwidth */
 +      if (ISSUPP_CHANWIDTH40(priv->adapter->hw_dot_11n_dev_cap) &&
 +          bss_desc->bcn_ht_cap &&
 +          ISALLOWED_CHANWIDTH40(bss_desc->bcn_ht_oper->ht_param))
 +              ht_oper->ht_param = bss_desc->bcn_ht_oper->ht_param;
 +
 +      if (vht_enabled) {
 +              ht_oper->ht_param =
 +                        mwifiex_get_sec_chan_offset(bss_desc->channel);
 +              ht_oper->ht_param |= BIT(2);
 +      }
 +
 +      memcpy(&sta_ptr->tdls_cap.ht_oper, ht_oper,
 +             sizeof(struct ieee80211_ht_operation));
 +
 +      return 0;
 +}
 +
  static int mwifiex_tdls_add_vht_oper(struct mwifiex_private *priv,
-                                    u8 *mac, struct sk_buff *skb)
+                                    const u8 *mac, struct sk_buff *skb)
  {
        struct mwifiex_bssdescriptor *bss_desc;
        struct ieee80211_vht_operation *vht_oper;

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

diff --cc include/net/cfg80211.h
Simple merge

diff --cc net/mac80211/chan.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/trace.h
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/rfkill/rfkill-gpio.c
Simple merge

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

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