diff --git lib/lib80211/regdomain.xml lib/lib80211/regdomain.xml index 16b74445f429..23f805615163 100644 --- lib/lib80211/regdomain.xml +++ lib/lib80211/regdomain.xml @@ -21,6 +21,29 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The regulatory data currently used for APAC2 just for AU is based on +https://git.kernel.org/pub/scm/linux/kernel/git/wens/wireless-regdb.git/ +at 3ceaf3bc0a3d81acd0c1bc413a620ed18e41475f . + + Copyright (c) 2008, Luis R. Rodriguez + Copyright (c) 2008, Johannes Berg + Copyright (c) 2008, Michael Green + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +The APAC2/AU data was created by a hack of a perl script by +Bjoern A. Zeeb which does the job. --> @@ -922,94 +945,207 @@ + APAC2 0x51 - - - - 30 - IEEE80211_CHAN_B - - - - - - 30 - IEEE80211_CHAN_G - - - - - - 17 - - - - 23 - IEEE80211_CHAN_PASSIVE - IEEE80211_CHAN_DFS - - - - 23 - - - - 23 - - - - - - 30 - IEEE80211_CHAN_G - IEEE80211_CHAN_HT20 - - - - 30 - IEEE80211_CHAN_G - IEEE80211_CHAN_HT40 - - - - - - 17 - IEEE80211_CHAN_HT20 - - - - 17 - IEEE80211_CHAN_HT40 - - - - 23 - IEEE80211_CHAN_HT20 - IEEE80211_CHAN_PASSIVE - IEEE80211_CHAN_DFS - - - - 23 - IEEE80211_CHAN_HT40 - IEEE80211_CHAN_PASSIVE - IEEE80211_CHAN_DFS - - - - 23 - IEEE80211_CHAN_HT20 - - - - 23 - IEEE80211_CHAN_HT40 - - + + + + 36 + + + + + + 36 + + + + + + 36 + + + + 36 + + + + + + 23 + INDOOR + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + + + 26 + IEEE80211_CHAN_DFS + + + + 26 + IEEE80211_CHAN_DFS + + + + 36 + + + + 13 + + + + + + 23 + INDOOR + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + + + 26 + IEEE80211_CHAN_DFS + + + + 26 + IEEE80211_CHAN_DFS + + + + 36 + + + + 13 + + + + 23 + INDOOR + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + + + 26 + IEEE80211_CHAN_DFS + + + + 26 + IEEE80211_CHAN_DFS + + + + 36 + + + + + + 23 + INDOOR + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + + + 26 + IEEE80211_CHAN_DFS + + + + 26 + IEEE80211_CHAN_DFS + + + + 36 + + + + 13 + + + + 23 + INDOOR + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + + + 26 + IEEE80211_CHAN_DFS + + + + 26 + IEEE80211_CHAN_DFS + + + + 36 + + + + 23 + INDOOR + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + + + 26 + IEEE80211_CHAN_DFS + + + + 26 + IEEE80211_CHAN_DFS + + + + 36 + + + + 20 + IEEE80211_CHAN_DFS + INDOOR + + @@ -1703,7 +1839,7 @@ 51 Armenia - 36 Australia + 36 Australia 40 Austria @@ -2479,6 +2615,244 @@ IEEE80211_CHAN_GSM + + + 2422 2472 + 20 5 + IEEE80211_CHAN_B + + + 2422 2472 + 20 5 + IEEE80211_CHAN_G + + + 2422 2472 + 20 5 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT20 + + + 2422 2472 + 40 5 + IEEE80211_CHAN_G + IEEE80211_CHAN_HT40 + + + 5160 5240 + 20 20 + IEEE80211_CHAN_A + + + 5260 5340 + 20 20 + IEEE80211_CHAN_A + + + 5480 5580 + 20 20 + IEEE80211_CHAN_A + + + 5660 5720 + 20 20 + IEEE80211_CHAN_A + + + 5745 5825 + 20 20 + IEEE80211_CHAN_A + + + 5865 5865 + 20 20 + IEEE80211_CHAN_A + + + 5160 5240 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5260 5340 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5480 5580 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5660 5720 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5745 5825 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5865 5865 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5160 5240 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + + + 5260 5340 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + + + 5480 5580 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + + + 5660 5720 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + + + 5745 5825 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + + + 5160 5240 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_VHT20 + + + 5260 5340 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_VHT20 + + + 5480 5580 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_VHT20 + + + 5660 5720 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_VHT20 + + + 5745 5825 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_VHT20 + + + 5865 5865 + 20 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + IEEE80211_CHAN_VHT20 + + + 5160 5240 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT40 + + + 5260 5340 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT40 + + + 5480 5580 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT40 + + + 5660 5720 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT40 + + + 5745 5825 + 40 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT40 + + + 5160 5240 + 80 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT80 + + + 5260 5340 + 80 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT80 + + + 5480 5580 + 80 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT80 + + + 5660 5720 + 80 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT80 + + + 5745 5825 + 80 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT80 + + + 5180 5320 + 160 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + IEEE80211_CHAN_VHT160 +