diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
| commit | 409ec36c320d580a036045e603f96286c362c609 (patch) | |
| tree | 3dd9b3569799f7962b523a068052445e2d2c51aa /drivers/net/wireless/libertas/host.h | |
| parent | 1b7fe59322bef9e7a2c05b64a07a66b875299736 (diff) | |
| parent | 8d5eab5aa676378b4c9daa62d10d08a0bca04677 (diff) | |
| download | talos-obmc-linux-409ec36c320d580a036045e603f96286c362c609.tar.gz talos-obmc-linux-409ec36c320d580a036045e603f96286c362c609.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas/host.h')
| -rw-r--r-- | drivers/net/wireless/libertas/host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h index 5eac1351a021..6cb6935ee4a3 100644 --- a/drivers/net/wireless/libertas/host.h +++ b/drivers/net/wireless/libertas/host.h @@ -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; |
