summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl1251
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2011-03-07 11:14:23 -0800
committerJohn W. Linville <linville@tuxdriver.com>2011-03-09 16:10:56 -0500
commit80751e2b8ffcbbe065e850d943301aa1ab219599 (patch)
tree454176f57e0765986809009c71076ff483160ce4 /drivers/net/wireless/wl1251
parentb9ede5f1dc03f96949dcaa8f8b3483766c047260 (diff)
downloadlwn-80751e2b8ffcbbe065e850d943301aa1ab219599.tar.gz
lwn-80751e2b8ffcbbe065e850d943301aa1ab219599.zip
ieee80211: add IEEE80211_COUNTRY_STRING_LEN definition
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>
Diffstat (limited to 'drivers/net/wireless/wl1251')
-rw-r--r--drivers/net/wireless/wl1251/wl12xx_80211.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl1251/wl12xx_80211.h b/drivers/net/wireless/wl1251/wl12xx_80211.h
index 184628027213..1417b1445c3d 100644
--- a/drivers/net/wireless/wl1251/wl12xx_80211.h
+++ b/drivers/net/wireless/wl1251/wl12xx_80211.h
@@ -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;