bridge: release failed member devices

[project/netifd.git] / scripts / netifd-wireless.sh

diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh
index 3cb55a3..c5d8a96 100644 (file)
--- a/scripts/netifd-wireless.sh
+++ b/scripts/netifd-wireless.sh
@@ -248,14 +248,6 @@ wireless_vif_parse_encryption() {
        esac
 }
 
        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
 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
        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
                        json_select config

-                       _get_vif_vars
+                       json_get_var _w_type mode

                        json_select ..
                        _w_types=" $_w_types "
                        [[ "${_w_types%$_w_type*}" = "$_w_types" ]] && {
                        json_select ..
                        _w_types=" $_w_types "
                        [[ "${_w_types%$_w_type*}" = "$_w_types" ]] && {


@@ -287,7 +280,7 @@ _wdev_common_device_config() {
 }
 
 _wdev_common_iface_config() {
 }
 
 _wdev_common_iface_config() {

-       config_add_string mode ssid encryption key
+       config_add_string mode ssid encryption 'key:wpakey'

 }
 
 init_wireless_driver() {
 }
 
 init_wireless_driver() {