X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=scripts%2Fnetifd-wireless.sh;h=8c0ff78d2e740677ea24cf1956a2ad639a70f255;hp=3cb55a390b6656217bdd6ad50038ab195b79478f;hb=29db00ed0efb251bd88ecce298356f2702b6cee1;hpb=501a088692cdf95feb237e030698f365c4465fdc diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh index 3cb55a3..8c0ff78 100644 --- a/scripts/netifd-wireless.sh +++ b/scripts/netifd-wireless.sh @@ -248,14 +248,6 @@ wireless_vif_parse_encryption() { esac } -_get_vif_vars() { - # internal use - json_get_var _w_type mode - - # for drivers - json_get_var network_bridge bridge -} - for_each_interface() { local _w_types="$1"; shift local _w_ifaces _w_iface @@ -267,8 +259,9 @@ for_each_interface() { for _w_iface in $_w_ifaces; do json_select "$_w_iface" if [ -n "$_w_types" ]; then + json_get_var network_bridge bridge json_select config - _get_vif_vars + json_get_var _w_type mode json_select .. _w_types=" $_w_types " [[ "${_w_types%$_w_type*}" = "$_w_types" ]] && {