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

Commit 517357c6 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: assimilate and export ieee80211_bss_get_ie 



This function from mac80211 seems generally useful, and
I will need it in cfg80211 soon.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0eb14647

include/net/cfg80211.h

+9 −0
Original line number Diff line number Diff line
@@ -604,6 +604,15 @@ struct cfg80211_bss { 
	u8 priv[0] __attribute__((__aligned__(sizeof(void *))));

};



/**

 * ieee80211_bss_get_ie - find IE with given ID

 * @bss: the bss to search

 * @ie: the IE ID

 * Returns %NULL if not found.

 */

const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie);





/**

 * struct cfg80211_crypto_settings - Crypto settings

 * @wpa_versions: indicates which, if any, WPA versions are enabled

net/mac80211/mlme.c

+3 −22
Original line number Diff line number Diff line
@@ -46,26 +46,6 @@ static int ecw2cw(int ecw) 
	return (1 << ecw) - 1;

}



static u8 *ieee80211_bss_get_ie(struct ieee80211_bss *bss, u8 ie)

{

	u8 *end, *pos;



	pos = bss->cbss.information_elements;

	if (pos == NULL)

		return NULL;

	end = pos + bss->cbss.len_information_elements;



	while (pos + 1 < end) {

		if (pos + 2 + pos[1] > end)

			break;

		if (pos[0] == ie)

			return pos;

		pos += 2 + pos[1];

	}



	return NULL;

}



static int ieee80211_compatible_rates(struct ieee80211_bss *bss,

				      struct ieee80211_supported_band *sband,

				      u32 *rates)
@@ -181,7 +161,8 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_local *local = sdata->local;

	struct sk_buff *skb;

	struct ieee80211_mgmt *mgmt;

	u8 *pos, *ies, *ht_ie;

	u8 *pos;

	const u8 *ies, *ht_ie;

	int i, len, count, rates_len, supp_rates_len;

	u16 capab;

	struct ieee80211_bss *bss;
@@ -345,7 +326,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) 
	 */

	if (wmm && (ifmgd->flags & IEEE80211_STA_WMM_ENABLED) &&

	    sband->ht_cap.ht_supported &&

	    (ht_ie = ieee80211_bss_get_ie(bss, WLAN_EID_HT_INFORMATION)) &&

	    (ht_ie = ieee80211_bss_get_ie(&bss->cbss, WLAN_EID_HT_INFORMATION)) &&

	    ht_ie[1] >= sizeof(struct ieee80211_ht_info) &&

	    (!(ifmgd->flags & IEEE80211_STA_DISABLE_11N))) {

		struct ieee80211_ht_info *ht_info =

net/wireless/util.c

+21 −0
Original line number Diff line number Diff line
@@ -502,3 +502,24 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb) 
	return dscp >> 5;

}

EXPORT_SYMBOL(cfg80211_classify8021d);



const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie)

{

	u8 *end, *pos;



	pos = bss->information_elements;

	if (pos == NULL)

		return NULL;

	end = pos + bss->len_information_elements;



	while (pos + 1 < end) {

		if (pos + 2 + pos[1] > end)

			break;

		if (pos[0] == ie)

			return pos;

		pos += 2 + pos[1];

	}



	return NULL;

}

EXPORT_SYMBOL(ieee80211_bss_get_ie);