diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-11-05 14:39:15 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-11-05 22:39:52 +0000 |
| commit | 9a47bc58f7543a12d6fc59f4c92fd4e5de2c18ec (patch) | |
| tree | 408ad1fb2953e023e94d6dd2676b46da90568952 /wsutil | |
| parent | 25e3a6c021d2c45284bb94ab93704f0a8938f2ee (diff) | |
Match what most source say are the actual Japanese 4.9 GHz channels.
I don't know where Matthew Gast got his 4.9 GHz channels, but IEEE Std
802.11-2012 and ARIB STD T-71 have something different.
Change-Id: I5d86b12193e38422d3702f36cb106fe858daa4b5
Reviewed-on: https://code.wireshark.org/review/11585
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/frequency-utils.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/wsutil/frequency-utils.c b/wsutil/frequency-utils.c index 43cb323864..8fce1fca73 100644 --- a/wsutil/frequency-utils.c +++ b/wsutil/frequency-utils.c @@ -36,21 +36,33 @@ typedef struct freq_cvt_s { #define FREQ_STEP 5 /* MHz. This seems to be consistent, thankfully */ /* - * From "802.11 Wireless Networks: The Definitive Guide", 2nd Ed. by - * Matthew Gast. + * From IEEE Std 802.11-2012: * - * XXX - what about Japanese channels 182 through 196, also in the 4.9 GHz - * band, with frequencies of 4910 + (chan - 182)*5 MHz? + * section 16.4.6.3 "Channel Numbering of operating channels"; + * + * section 17.4.6.3 "Channel Numbering of operating channels"; + * + * section 18.3.8.4.2 "Channel numbering"; + * + * Annex E. + * + * XXX - Japanese channels 182 through 196 actually have center + * frequencies that are off by 2.5 MHz from these values, according + * to the IEEE standard, although the table in ARIB STD T-71 version 5.2: + * + * http://www.arib.or.jp/english/html/overview/doc/1-STD-T71v5_2.pdf + * + * section 5.3.8.3.3 doesn't show that. * * XXX - what about the U.S. public safety 4.9 GHz band? * * XXX - what about 802.11ad? */ static freq_cvt_t freq_cvt[] = { - { 2412, 2472, 1, TRUE }, /* Table 12-1, p 257 */ - { 2484, 2484, 14, TRUE }, /* Table 12-1, p 257 */ - { 5000, 5995, 0, FALSE }, /* Table 13-1, p 289 */ - { 4920, 4995, 240, FALSE } /* Table 13-1, p 289 */ + { 2412, 2472, 1, TRUE }, + { 2484, 2484, 14, TRUE }, + { 5000, 5995, 0, FALSE }, + { 4910, 4980, 182, FALSE } }; #define NUM_FREQ_CVT (sizeof(freq_cvt) / sizeof(freq_cvt_t)) |