Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux...

Johannes Berg says:

====================
Lots of updates for net-next; along with the usual flurry
of small fixes, cleanups and internal features we have:
 * VHT support for TDLS and IBSS (conditional on drivers though)
 * first TX performance improvements (the biggest will come later)
 * many suspend/resume (race) fixes
 * name_assign_type support from Tom Gundersen
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/cw1200/sta.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/coex.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

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

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
index 8e1f681f960b73e02385d74a48b9e0b4efde16b3,2d489bfaea084e229a9b7fbac77b41761449e0b3..6f8993c12373587e3839e5d35a458a68ce882968
--- 1/drivers/net/wireless/mwifiex/cfg80211.c
--- 2/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@@ -2397,8 -2397,9 +2397,8 @@@ mwifiex_setup_ht_caps(struct ieee80211_
        ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
  }
  
 -#define MWIFIEX_MAX_WQ_LEN  30
  /*
-  *  create a new virtual interface with the given name
+  *  create a new virtual interface with the given name and name assign type
   */
  struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                                              const char *name,

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/wireless/nl80211.c
index 2fb804bfa361022ba909fe8cac1f4ac11886dfdd,f60ee5b45c0c80b7e497ce167bf35104ae287e6c..6dd1ab3b10ea25c76e20a73998bb5f1ebc41b6b8
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -2662,13 -2665,10 +2661,14 @@@ static int nl80211_new_interface(struc
            !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))
                return -EOPNOTSUPP;
  
 +      msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
 +      if (!msg)
 +              return -ENOMEM;
 +
        wdev = rdev_add_virtual_intf(rdev,
                                nla_data(info->attrs[NL80211_ATTR_IFNAME]),
-                               type, err ? NULL : &flags, &params);
+                               NET_NAME_USER, type, err ? NULL : &flags,
+                               &params);
        if (WARN_ON(!wdev)) {
                nlmsg_free(msg);
                return -EPROTO;

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

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