android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition

Browse Source 
and make use of it in wireless drivers

Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bing Zhao 2011-03-07 11:14:23 -08:00 committed by John W. Linville
parent b9ede5f1dc
commit 80751e2b8f
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/at76c50x-usb.h
View File

@ -290,7 +290,7 @@ struct mib_mac_mgmt {
u8 res; u8 res;
u8 multi_domain_capability_implemented; u8 multi_domain_capability_implemented;
u8 multi_domain_capability_enabled; u8 multi_domain_capability_enabled;
u8 country_string[3]; u8 country_string[IEEE80211_COUNTRY_STRING_LEN];
u8 reserved[3]; u8 reserved[3];
} __packed; } __packed;

2
drivers/net/wireless/ipw2x00/ipw2200.h
View File

@ -961,7 +961,7 @@ struct ipw_country_channel_info {
struct ipw_country_info { struct ipw_country_info {
u8 id; u8 id;
u8 length; u8 length;
u8 country_str[3]; u8 country_str[IEEE80211_COUNTRY_STRING_LEN];
struct ipw_country_channel_info groups[7]; struct ipw_country_channel_info groups[7];
} __packed; } __packed;

2
drivers/net/wireless/libertas/host.h
View File

@ -387,7 +387,7 @@ struct lbs_offset_value {
struct mrvl_ie_domain_param_set { struct mrvl_ie_domain_param_set {
struct mrvl_ie_header header; struct mrvl_ie_header header;
u8 country_code[3]; u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
struct ieee80211_country_ie_triplet triplet[MAX_11D_TRIPLETS]; struct ieee80211_country_ie_triplet triplet[MAX_11D_TRIPLETS];
} __packed; } __packed;

3
drivers/net/wireless/wl1251/wl12xx_80211.h
View File

@ -54,7 +54,6 @@
/* This really should be 8, but not for our firmware */ /* This really should be 8, but not for our firmware */
#define MAX_SUPPORTED_RATES 32 #define MAX_SUPPORTED_RATES 32
#define COUNTRY_STRING_LEN 3
#define MAX_COUNTRY_TRIPLETS 32 #define MAX_COUNTRY_TRIPLETS 32
/* Headers */ /* Headers */
@ -98,7 +97,7 @@ struct country_triplet {
struct wl12xx_ie_country { struct wl12xx_ie_country {
struct wl12xx_ie_header header; struct wl12xx_ie_header header;
u8 country_string[COUNTRY_STRING_LEN]; u8 country_string[IEEE80211_COUNTRY_STRING_LEN];
struct country_triplet triplets[MAX_COUNTRY_TRIPLETS]; struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
} __packed; } __packed;

3
drivers/net/wireless/wl12xx/wl12xx_80211.h
View File

@ -55,7 +55,6 @@
/* This really should be 8, but not for our firmware */ /* This really should be 8, but not for our firmware */
#define MAX_SUPPORTED_RATES 32 #define MAX_SUPPORTED_RATES 32
#define COUNTRY_STRING_LEN 3
#define MAX_COUNTRY_TRIPLETS 32 #define MAX_COUNTRY_TRIPLETS 32
/* Headers */ /* Headers */
@ -99,7 +98,7 @@ struct country_triplet {
struct wl12xx_ie_country { struct wl12xx_ie_country {
struct wl12xx_ie_header header; struct wl12xx_ie_header header;
u8 country_string[COUNTRY_STRING_LEN]; u8 country_string[IEEE80211_COUNTRY_STRING_LEN];
struct country_triplet triplets[MAX_COUNTRY_TRIPLETS]; struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
} __packed; } __packed;

3
include/linux/ieee80211.h
View File

@ -1325,6 +1325,9 @@ enum {
/* Although the spec says 8 I'm seeing 6 in practice */ /* Although the spec says 8 I'm seeing 6 in practice */
#define IEEE80211_COUNTRY_IE_MIN_LEN 6 #define IEEE80211_COUNTRY_IE_MIN_LEN 6
/* The Country String field of the element shall be 3 octets in length */
#define IEEE80211_COUNTRY_STRING_LEN 3
/* /*
* For regulatory extension stuff see IEEE 802.11-2007 * For regulatory extension stuff see IEEE 802.11-2007
* Annex I (page 1141) and Annex J (page 1147). Also * Annex I (page 1141) and Annex J (page 1147). Also