From 29db00ed0efb251bd88ecce298356f2702b6cee1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 2 Dec 2013 17:36:44 +0100 Subject: [PATCH] wireless: fix getting the network_bridge variable Signed-off-by: Felix Fietkau --- scripts/netifd-wireless.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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" ]] && { -- 2.11.0