From: David S. Miller <davem@davemloft.net>
Date: Tue, 31 Mar 2015 20:39:04 +0000 (-0400)
Subject: Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~176^2~1974^2~105
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b6249bba940f57c20cdde793b306ca3831778c7;p=firefly-linux-kernel-4.4.55.git

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

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>
---

7b6249bba940f57c20cdde793b306ca3831778c7
diff --cc drivers/net/wireless/mwifiex/cfg80211.c
index 8e1f681f960b,2d489bfaea08..6f8993c12373
--- a/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 net/wireless/nl80211.c
index 2fb804bfa361,f60ee5b45c0c..6dd1ab3b10ea
--- a/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;