hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cfg80211: rename regulatory_hint_11d() to regulatory_hint_country_ie() 

It is incorrect to refer to this as 11d as 802.11d was just a
proposed amendment, 802.11d was merged to the standard so
use proper terminology.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Luis R. Rodriguez 2013-10-04 18:07:24 -07:00 committed by Johannes Berg
parent fe1811438a
commit 789fd03331
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/nl80211.h
View File

@ -988,7 +988,7 @@ enum nl80211_commands {
* to query the CRDA to retrieve one regulatory domain. This attribute can * to query the CRDA to retrieve one regulatory domain. This attribute can
* also be used by userspace to query the kernel for the currently set * also be used by userspace to query the kernel for the currently set
* regulatory domain. We chose an alpha2 as that is also used by the * regulatory domain. We chose an alpha2 as that is also used by the
* IEEE-802.11d country information element to identify a country. * IEEE-802.11 country information element to identify a country.
* Users can also simply ask the wireless core to set regulatory domain * Users can also simply ask the wireless core to set regulatory domain
* to a specific alpha2. * to a specific alpha2.
* @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory * @NL80211_ATTR_REG_RULES: a nested array of regulatory domain regulatory

4
net/wireless/reg.c
View File

@ -1699,8 +1699,8 @@ int regulatory_hint(struct wiphy *wiphy, const char *alpha2)
} }
EXPORT_SYMBOL(regulatory_hint); EXPORT_SYMBOL(regulatory_hint);
void regulatory_hint_11d(struct wiphy *wiphy, enum ieee80211_band band, void regulatory_hint_country_ie(struct wiphy *wiphy, enum ieee80211_band band,
const u8 *country_ie, u8 country_ie_len) const u8 *country_ie, u8 country_ie_len)
{ {
char alpha2[2]; char alpha2[2];
enum environment_cap env = ENVIRON_ANY; enum environment_cap env = ENVIRON_ANY;

4
net/wireless/reg.h
View File

@ -58,7 +58,7 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,
gfp_t gfp); gfp_t gfp);
/** /**
* regulatory_hint_11d - hints a country IE as a regulatory domain * regulatory_hint_country_ie - hints a country IE as a regulatory domain
* @wiphy: the wireless device giving the hint (used only for reporting * @wiphy: the wireless device giving the hint (used only for reporting
* conflicts) * conflicts)
* @band: the band on which the country IE was received on. This determines * @band: the band on which the country IE was received on. This determines
@ -78,7 +78,7 @@ int regulatory_hint_found_beacon(struct wiphy *wiphy,
* not observed. For this reason if a triplet is seen with channel * not observed. For this reason if a triplet is seen with channel
* information for a band the BSS is not present in it will be ignored. * information for a band the BSS is not present in it will be ignored.
*/ */
void regulatory_hint_11d(struct wiphy *wiphy, void regulatory_hint_country_ie(struct wiphy *wiphy,
enum ieee80211_band band, enum ieee80211_band band,
const u8 *country_ie, const u8 *country_ie,
u8 country_ie_len); u8 country_ie_len);

4
net/wireless/sme.c
View File

@ -682,8 +682,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
* - country_ie + 2, the start of the country ie data, and * - country_ie + 2, the start of the country ie data, and
* - and country_ie[1] which is the IE length * - and country_ie[1] which is the IE length
*/ */
regulatory_hint_11d(wdev->wiphy, bss->channel->band, regulatory_hint_country_ie(wdev->wiphy, bss->channel->band,
country_ie + 2, country_ie[1]); country_ie + 2, country_ie[1]);
kfree(country_ie); kfree(country_ie);
} }