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

Commit 23d6660d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge mac80211-next into ath-next 

Patch "ath10k: introduce basic tdls functionality" depends on this mac80211
patch:

c23e31cf mac80211: initialize rate control earlier for tdls station
parents 53513c30 5d8325ec

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

+2 −1
Original line number Diff line number Diff line
@@ -1632,7 +1632,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

+5 −4
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,

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;

drivers/net/wireless/cw1200/sta.c

+2 −2
Original line number Diff line number Diff line
@@ -1240,8 +1240,8 @@ static void cw1200_do_join(struct cw1200_common *priv) 


	bssid = priv->vif->bss_conf.bssid;



	bss = cfg80211_get_bss(priv->hw->wiphy, priv->channel,

			bssid, NULL, 0, 0, 0);

	bss = cfg80211_get_bss(priv->hw->wiphy, priv->channel, bssid, NULL, 0,

			       IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);



	if (!bss && !conf->ibss_joined) {

		wsm_unlock_tx(priv);

drivers/net/wireless/ipw2x00/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ config IPW2100_DEBUG 
config IPW2200

	tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"

	depends on PCI && CFG80211

	select CFG80211_WEXT

	select CFG80211_WEXT_EXPORT

	select WIRELESS_EXT

	select WEXT_SPY

	select WEXT_PRIV