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

Commit 80751e2b authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville
Browse files

ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition 



and make use of it in wireless drivers

Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b9ede5f1

drivers/net/wireless/at76c50x-usb.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ struct mib_mac_mgmt { 
	u8 res;

	u8 multi_domain_capability_implemented;

	u8 multi_domain_capability_enabled;

	u8 country_string[3];

	u8 country_string[IEEE80211_COUNTRY_STRING_LEN];

	u8 reserved[3];

} __packed;

drivers/net/wireless/ipw2x00/ipw2200.h

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ struct ipw_country_channel_info { 
struct ipw_country_info {

	u8 id;

	u8 length;

	u8 country_str[3];

	u8 country_str[IEEE80211_COUNTRY_STRING_LEN];

	struct ipw_country_channel_info groups[7];

} __packed;

drivers/net/wireless/libertas/host.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ struct lbs_offset_value { 
struct mrvl_ie_domain_param_set {

	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];

} __packed;

drivers/net/wireless/wl1251/wl12xx_80211.h

+1 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 


/* This really should be 8, but not for our firmware */

#define MAX_SUPPORTED_RATES 32

#define COUNTRY_STRING_LEN 3

#define MAX_COUNTRY_TRIPLETS 32



/* Headers */
@@ -98,7 +97,7 @@ struct country_triplet { 


struct wl12xx_ie_country {

	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];

} __packed;

drivers/net/wireless/wl12xx/wl12xx_80211.h

+1 −2
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 


/* This really should be 8, but not for our firmware */

#define MAX_SUPPORTED_RATES 32

#define COUNTRY_STRING_LEN 3

#define MAX_COUNTRY_TRIPLETS 32



/* Headers */
@@ -99,7 +98,7 @@ struct country_triplet { 


struct wl12xx_ie_country {

	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];

} __packed;