Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6249bb authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2015-03-30' of... 

Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/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: default avatarDavid S. Miller <davem@davemloft.net>
parents fbcb2170 2c44be81

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -1412,7 +1412,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar, 
	lockdep_assert_held(&ar->conf_mutex);



	bss = cfg80211_get_bss(ar->hw->wiphy, ar->hw->conf.chandef.chan,

			       info->bssid, NULL, 0, 0, 0);

			       info->bssid, NULL, 0, IEEE80211_BSS_TYPE_ANY,

			       IEEE80211_PRIVACY_ANY);

	if (bss) {

		const struct cfg80211_bss_ies *ies;

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

+9 −6
Original line number Diff line number Diff line
@@ -686,20 +686,21 @@ ath6kl_add_bss_if_needed(struct ath6kl_vif *vif, 
{

	struct ath6kl *ar = vif->ar;

	struct cfg80211_bss *bss;

	u16 cap_mask, cap_val;

	u16 cap_val;

	enum ieee80211_bss_type bss_type;

	u8 *ie;



	if (nw_type & ADHOC_NETWORK) {

		cap_mask = WLAN_CAPABILITY_IBSS;

		cap_val = WLAN_CAPABILITY_IBSS;

		bss_type = IEEE80211_BSS_TYPE_IBSS;

	} else {

		cap_mask = WLAN_CAPABILITY_ESS;

		cap_val = WLAN_CAPABILITY_ESS;

		bss_type = IEEE80211_BSS_TYPE_ESS;

	}



	bss = cfg80211_get_bss(ar->wiphy, chan, bssid,

			       vif->ssid, vif->ssid_len,

			       cap_mask, cap_val);

			       bss_type, IEEE80211_PRIVACY_ANY);

	if (bss == NULL) {

		/*

		 * Since cfg80211 may not yet know about the BSS,
@@ -1495,6 +1496,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy, 


static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,

						      const char *name,

						      unsigned char name_assign_type,

						      enum nl80211_iftype type,

						      u32 *flags,

						      struct vif_params *params)
@@ -1513,7 +1515,7 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, 
		return ERR_PTR(-EINVAL);

	}



	wdev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);

	wdev = ath6kl_interface_add(ar, name, name_assign_type, type, if_idx, nw_type);

	if (!wdev)

		return ERR_PTR(-ENOMEM);
@@ -3633,13 +3635,14 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif) 
}



struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,

					  unsigned char name_assign_type,

					  enum nl80211_iftype type,

					  u8 fw_vif_idx, u8 nw_type)

{

	struct net_device *ndev;

	struct ath6kl_vif *vif;



	ndev = alloc_netdev(sizeof(*vif), name, NET_NAME_UNKNOWN, ether_setup);

	ndev = alloc_netdev(sizeof(*vif), name, name_assign_type, ether_setup);

	if (!ndev)

		return NULL;

drivers/net/wireless/ath/ath6kl/cfg80211.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ enum ath6kl_cfg_suspend_mode { 
};



struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,

					  unsigned char name_assign_type,

					  enum nl80211_iftype type,

					  u8 fw_vif_idx, u8 nw_type);

void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,

drivers/net/wireless/ath/ath6kl/core.c

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type) 
	rtnl_lock();



	/* Add an initial station interface */

	wdev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,

				    INFRA_NETWORK);

	wdev = ath6kl_interface_add(ar, "wlan%d", NET_NAME_ENUM,

				    NL80211_IFTYPE_STATION, 0, INFRA_NETWORK);



	rtnl_unlock();

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, 


	bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,

			       sme->ssid, sme->ssid_len,

			       WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);

			       IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY);

	if (!bss) {

		wil_err(wil, "Unable to find BSS\n");

		return -ENOENT;