Make the wireless regulatory domain a global configuration option

[people/stevee/network.git] / src / hooks / zones / batman-adv

diff --git a/src/hooks/zones/batman-adv b/src/hooks/zones/batman-adv
index 7390114e17a1ddf1fe46722e1235f41892a8221b..23aa66d7d5506f461ea36273fc22690b39590f1d 100644 (file)
--- a/src/hooks/zones/batman-adv
+++ b/src/hooks/zones/batman-adv
@@ -21,12 +21,11 @@
 
 . /usr/lib/network/header-zone
 
-HOOK_SETTINGS="HOOK ADDRESS MESH_ID SSID CHANNEL COUNTRY_CODE PHY"
+HOOK_SETTINGS="HOOK ADDRESS MESH_ID SSID CHANNEL PHY"
 
 # Default values
 ADDRESS=$(mac_generate)
 CHANNEL=1
-COUNTRY_CODE="US"
 MESH_ID=
 SSID=
 
@@ -38,7 +37,6 @@ function hook_check() {
        assert isset ADDRESS
        assert ismac ADDRESS
        assert isset CHANNEL
-       assert isset COUNTRY_CODE
        assert isset MESH_ID
        assert ismac MESH_ID
        assert isset PHY
@@ -55,9 +53,6 @@ function hook_parse_cmdline() {
                        --channel=*)
                                CHANNEL="$(cli_get_val ${1})"
                                ;;
-                       --country-code=*)
-                               COUNTRY_CODE="$(cli_get_val ${1})"
-                               ;;
                        --mesh-id=*)
                                MESH_ID="$(cli_get_val ${1})"
                                ;;