diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 14:06:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 14:06:59 -0500 |
| commit | ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78 (patch) | |
| tree | e25d01c62a4c7f3de78675faa6728b54848304e2 /include/linux | |
| parent | 70d279a7e2a6e308530822ba2bf4134cc0f5c091 (diff) | |
| parent | 409ec36c320d580a036045e603f96286c362c609 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ieee80211.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 294169e31364..2d1c6117d92c 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -1325,6 +1325,9 @@ enum { | |||
| 1325 | /* Although the spec says 8 I'm seeing 6 in practice */ | 1325 | /* Although the spec says 8 I'm seeing 6 in practice */ |
| 1326 | #define IEEE80211_COUNTRY_IE_MIN_LEN 6 | 1326 | #define IEEE80211_COUNTRY_IE_MIN_LEN 6 |
| 1327 | 1327 | ||
| 1328 | /* The Country String field of the element shall be 3 octets in length */ | ||
| 1329 | #define IEEE80211_COUNTRY_STRING_LEN 3 | ||
| 1330 | |||
| 1328 | /* | 1331 | /* |
| 1329 | * For regulatory extension stuff see IEEE 802.11-2007 | 1332 | * For regulatory extension stuff see IEEE 802.11-2007 |
| 1330 | * Annex I (page 1141) and Annex J (page 1147). Also | 1333 | * Annex I (page 1141) and Annex J (page 1147). Also |