X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmac80211%2Ffiles%2Flib%2Fnetifd%2Fwireless%2Fmac80211.sh;h=c98807f3cf2bd65e23b0b7362c716e99c4029cc3;hp=eefe1fed5dff70e4f0e93cc786a27f5c6aff1e1b;hb=f8e102ef2719929103e4a2910353b337e4cf1621;hpb=148b41b2f383f13a23d7a64394924c845838f986

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index eefe1fed5d..c98807f3cf 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -20,7 +20,7 @@ drv_mac80211_init_device_config() {
 	config_add_string path phy macaddr
 	config_add_string hwmode
 	config_add_int beacon_int chanbw frag rts
-	config_add_int rxantenna txantenna antenna_gain txpower
+	config_add_int rxantenna txantenna antenna_gain txpower distance
 	config_add_boolean noscan
 	config_add_array ht_capab
 }
@@ -28,7 +28,7 @@ drv_mac80211_init_device_config() {
 drv_mac80211_init_iface_config() {
 	hostapd_common_add_bss_config
 
-	config_add_string macaddr
+	config_add_string macaddr ifname
 
 	config_add_boolean wds powersave
 	config_add_int maxassoc
@@ -85,6 +85,8 @@ mac80211_hostapd_setup_bss() {
 	hostapd_set_bss_options hostapd_cfg "$vif" || return 1
 	json_get_vars wds dtim_period max_listen_int
 
+	set_default wds 0
+
 	[ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 	[ "$staidx" -gt 0 ] && append hostapd_cfg "start_disabled=1" "$N"
 
@@ -239,7 +241,7 @@ mac80211_setup_supplicant() {
 }
 
 mac80211_setup_adhoc() {
-	json_get_vars bssid ssid basic_rate key
+	json_get_vars bssid ssid key mcast_rate
 
 	keyspec=
 	[ "$auth_type" == "wep" ] && {
@@ -264,15 +266,14 @@ mac80211_setup_adhoc() {
 	}
 
 	brstr=
-	for br in $basic_rate; do
+	for br in $basic_rate_list; do
 		hostapd_add_rate brstr "$br"
 	done
 
 	mcval=
 	[ -n "$mcast_rate" ] && hostapd_add_rate mcval "$mcast_rate"
 
-	iw dev "$ifname" ibss join "$ssid" $freq $htmode \
-		${fixed:+fixed-freq} $bssid \
+	iw dev "$ifname" ibss join "$ssid" $freq $htmode fixed-freq $bssid \
 		${beacon_int:+beacon-interval $beacon_int} \
 		${brstr:+basic-rates $brstr} \
 		${mcval:+mcast-rate $mcval} \
@@ -309,7 +310,7 @@ mac80211_setup_vif() {
 		;;
 		adhoc)
 			wireless_vif_parse_encryption
-			if [ "$wpa" -gt 0 ]; then
+			if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ]; then
 				mac80211_setup_supplicant || failed=1
 			else
 				mac80211_setup_adhoc
@@ -351,6 +352,7 @@ drv_mac80211_setup() {
 		txpower antenna_gain \
 		rxantenna txantenna \
 		frag rts beacon_int
+	json_get_values basic_rate_list basic_rate
 	json_select ..
 
 	find_phy || {