X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=scripts%2Fnetifd-wireless.sh;h=f981f1b2803aee1f55b4dba947b2ea34a5e2aaa1;hp=e26cea5a261656d88fc303f1956ec41de520b72d;hb=827145f01d849c663f18e356157fd71f1a7cc45d;hpb=7b0bd859249ee2c8af63f159534d2944d969056d

diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh
index e26cea5..f981f1b 100644
--- a/scripts/netifd-wireless.sh
+++ b/scripts/netifd-wireless.sh
@@ -58,7 +58,7 @@ _wdev_prepare_channel() {
 		;;
 	esac
 
-	[[ "$hwmode_n" = "$hwmode" ]] && {
+	[[ "$hwmode_n" = "$hwmode" ]] || {
 		enable_ht=1
 		hwmode="$hwmode_n"
 
@@ -248,12 +248,16 @@ wireless_vif_parse_encryption() {
 	esac
 }
 
-_get_vif_vars() {
-	# internal use
-	json_get_var _w_type mode
+_wireless_set_brsnoop_isolation() {
+	local multicast_to_unicast="$1"
+	local isolate
 
-	# for drivers
-	json_get_var network_bridge bridge
+	json_get_var isolate isolate
+
+	[ $isolate -gt 0 -o -z "$network_bridge" ] && return
+
+	[ -z "$multicast_to_unicast" ] && multicast_to_unicast=1
+	[ $multicast_to_unicast -gt 0 ] && json_add_boolean isolate 1
 }
 
 for_each_interface() {
@@ -262,13 +266,17 @@ for_each_interface() {
 	local _w_type
 	local _w_found
 
+	local multicast_to_unicast
+
 	json_get_keys _w_ifaces interfaces
 	json_select interfaces
 	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
+			_wireless_set_brsnoop_isolation "$multicast_to_unicast"
+			json_get_var _w_type mode
 			json_select ..
 			_w_types=" $_w_types "
 			[[ "${_w_types%$_w_type*}" = "$_w_types" ]] && {
@@ -283,11 +291,11 @@ for_each_interface() {
 }
 
 _wdev_common_device_config() {
-	config_add_string channel hwmode
+	config_add_string channel hwmode htmode
 }
 
 _wdev_common_iface_config() {
-	config_add_string mode ssid encryption key
+	config_add_string mode ssid encryption 'key:wpakey'
 }
 
 init_wireless_driver() {
@@ -297,6 +305,8 @@ init_wireless_driver() {
 	case "$cmd" in
 		dump)
 			add_driver() {
+				eval "drv_$1_cleanup"
+
 				json_init
 				json_add_string name "$1"