diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-10-21 13:47:25 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-11-27 11:19:49 -0500 |
commit | ef296c1b59ce96ef2aa1844fe4b80c87249a795a (patch) | |
tree | 58f71f45afc0d94ca5a541087e2b19b4a3bb1e16 | |
parent | 159f0f39db427f63e188839eac78718a8efe697e (diff) | |
download | wireless-regdb-ef296c1b59ce96ef2aa1844fe4b80c87249a795a.tar.gz |
wireless-regdb: consolidate passive-scan and no-ibss flags
These are used interchangeably so just do away
with the redundancy.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | db.txt | 8 | ||||
-rwxr-xr-x | dbparse.py | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -2,14 +2,14 @@ country 00: (2402 - 2472 @ 40), (3, 20) # Channel 12 - 13. - (2457 - 2482 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS + (2457 - 2482 @ 40), (3, 20), NO-IR # Channel 14. Only JP enables this and for 802.11b only - (2474 - 2494 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS, NO-OFDM + (2474 - 2494 @ 20), (3, 20), NO-IR, NO-OFDM # Channel 36 - 48 - (5170 - 5250 @ 80), (3, 20), PASSIVE-SCAN, NO-IBSS + (5170 - 5250 @ 80), (3, 20), NO-IR # NB: 5260 MHz - 5700 MHz requies DFS # Channel 149 - 165 - (5735 - 5835 @ 80), (3, 20), PASSIVE-SCAN, NO-IBSS + (5735 - 5835 @ 80), (3, 20), NO-IR # IEEE 802.11ad (60GHz), channels 1..3 (57240 - 63720 @ 2160), (N/A, 0) @@ -12,8 +12,8 @@ flag_definitions = { 'DFS': 1<<4, 'PTP-ONLY': 1<<5, 'PTMP-ONLY': 1<<6, - 'PASSIVE-SCAN': 1<<7, - 'NO-IBSS': 1<<8, + 'NO-IR': 1<<7, + # hole at bit 8 # hole at bit 9. FIXME: Where is NO-HT40 defined? 'NO-HT40': 1<<10, } |