X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c0a4b957c5cf75412560ed86daa66529c461eb14..f6ceb966a6d45934fb5ebf157f4e4f30652ea8ca:/package/mac80211/files/lib/wifi/mac80211.sh?ds=inline

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index 257277a28..b20785cf6 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -10,6 +10,7 @@ mac80211_hostapd_setup_base() {
 	config_get country "$device" country
 	config_get hwmode "$device" hwmode
 	config_get channel "$device" channel
+	config_get_bool noscan "$device" noscan
 	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
 	[ "$channel" = auto ] && channel=
 	[ -n "$hwmode" ] && {
@@ -71,6 +72,7 @@ tx_queue_data0_burst=1.5
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 ${country:+country_code=$country}
+${noscan:+noscan=$noscan}
 $base_cfg
 
 EOF
@@ -101,13 +103,17 @@ mac80211_hostapd_setup_bss() {
 	config_get_bool wds "$vif" wds 0
 	[ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 
+	local macaddr hidden maxassoc wmm
 	config_get macaddr "$vif" macaddr
+	config_get maxassoc "$vif" maxassoc
 	config_get_bool hidden "$vif" hidden 0
+	config_get_bool wmm "$vif" wmm 1
 	cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
-wmm_enabled=1
+wmm_enabled=$wmm
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
+${maxassoc:+max_num_sta=$maxassoc}
 EOF
 }
 
@@ -163,6 +169,14 @@ scan_mac80211() {
 	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${monitor:+$monitor }${mesh:+$mesh}"
 }
 
+list_phy_interfaces() {
+	local phy="$1"
+	if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then
+		ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null;
+	else
+		ls "/sys/class/ieee80211/${phy}/device" 2>/dev/null | grep net: | sed -e 's,net:,,g'
+	fi
+}
 
 disable_mac80211() (
 	local device="$1"
@@ -179,7 +193,7 @@ disable_mac80211() (
 	done
 
 	include /lib/network
-	for wdev in $(ls /sys/class/ieee80211/${phy}/device/net 2>/dev/null); do
+	for wdev in $(list_phy_interfaces "$phy"); do
 		[ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1
 		for pid in `pidof wpa_supplicant`; do
 			grep "$wdev" /proc/$pid/cmdline >/dev/null && \
@@ -204,12 +218,15 @@ enable_mac80211() {
 	config_get txpower "$device" txpower
 	config_get country "$device" country
 	config_get distance "$device" distance
+	config_get frag "$device" frag
+	config_get rts "$device" rts
 	find_mac80211_phy "$device" || return 0
 	config_get phy "$device" phy
 	local i=0
 	local macidx=0
 	local apidx=0
 	fixed=""
+	local hostapd_ctrl=""
 
 	[ -n "$country" ] && iw reg set "$country"
 	[ "$channel" = "auto" -o "$channel" = "0" ] || {
@@ -217,6 +234,8 @@ enable_mac80211() {
 	}
 
 	[ -n "$distance" ] && iw phy "$phy" set distance "$distance"
+	[ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
+	[ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
 
 	export channel fixed
 	# convert channel to frequency
@@ -302,36 +321,62 @@ enable_mac80211() {
 			[ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
 		fi
 
-		# txpower is not yet implemented in iw
 		config_get vif_txpower "$vif" txpower
 		# use vif_txpower (from wifi-iface) to override txpower (from
 		# wifi-device) if the latter doesn't exist
 		txpower="${txpower:-$vif_txpower}"
-		[ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
+		[ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00"
+	done
 
-		config_get frag "$vif" frag
-		if [ -n "$frag" ]; then
-			iw phy "$phy" set frag "${frag%%.*}"
-		fi
+	local start_hostapd=
+	rm -f /var/run/hostapd-$phy.conf
+	for vif in $vifs; do
+		config_get mode "$vif" mode
+		[ "$mode" = "ap" ] || continue
+		mac80211_hostapd_setup_bss "$phy" "$vif"
+		start_hostapd=1
+	done
 
-		config_get rts "$vif" rts
-		if [ -n "$rts" ]; then
-			iw phy "$phy" set rts "${rts%%.*}"
-		fi
+	[ -n "$start_hostapd" ] && {
+		hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
+			echo "Failed to start hostapd for $phy"
+			return
+		}
+		sleep 2
 
+		for vif in $vifs; do
+			config_get mode "$vif" mode
+			config_get ifname "$vif" ifname
+			[ "$mode" = "ap" ] || continue
+			hostapd_ctrl="${hostapd_ctrl:-/var/run/hostapd-$phy/$ifname}"
+			mac80211_start_vif "$vif" "$ifname"
+		done
+	}
+
+	for vif in $vifs; do
+		config_get mode "$vif" mode
+		config_get ifname "$vif" ifname
+		[ ! "$mode" = "ap" ] || continue
 		ifconfig "$ifname" up
 
 		if [ ! "$mode" = "ap" ]; then
-			mac80211_start_vif "$vif" "$ifname"
-
+			ifconfig "$ifname" up
 			case "$mode" in
 				adhoc)
 					config_get bssid "$vif" bssid
-					iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
+					config_get ssid "$vif" ssid
+					config_get mcast_rate "$vif" mcast_rate
+					local mcval=""
+					[ -n "$mcast_rate" ] && {
+						mcval="$(($mcast_rate / 1000))"
+						mcsub="$(( ($mcast_rate / 100) % 10 ))"
+						[ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
+					}
+					iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid ${mcval:+mcast-rate $mcval}
 				;;
 				sta)
 					if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-						wpa_supplicant_setup_vif "$vif" wext || {
+						wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" || {
 							echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
 							# make sure this wifi interface won't accidentally stay open without encryption
 							ifconfig "$ifname" down
@@ -340,32 +385,10 @@ enable_mac80211() {
 					fi
 				;;
 			esac
+			mac80211_start_vif "$vif" "$ifname"
 		fi
 	done
 
-	local start_hostapd=
-	rm -f /var/run/hostapd-$phy.conf
-	for vif in $vifs; do
-		config_get mode "$vif" mode
-		[ "$mode" = "ap" ] || continue
-		mac80211_hostapd_setup_bss "$phy" "$vif"
-		start_hostapd=1
-	done
-
-	[ -n "$start_hostapd" ] || return 0
-
-	hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
-		echo "Failed to start hostapd for $phy"
-		return
-	}
-	sleep 2
-
-	for vif in $vifs; do
-		config_get mode "$vif" mode
-		config_get ifname "$vif" ifname
-		[ "$mode" = "ap" ] || continue
-		mac80211_start_vif "$vif" "$ifname"
-	done
 }
 
 
@@ -393,7 +416,7 @@ detect_mac80211() {
 
 		mode_11n=""
 		mode_band="g"
-		channel="5"
+		channel="11"
 		ht_cap=0
 		for cap in $(iw phy "$dev" info | grep 'Capabilities:' | cut -d: -f2); do
 			ht_cap="$(($ht_cap | $cap))"
@@ -405,8 +428,13 @@ detect_mac80211() {
 
 			list="	list ht_capab"
 			[ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list	LDPC" "$N"
+			[ "$(($ht_cap & 16))" -eq 16 ] && append ht_capab "$list	GF" "$N"
 			[ "$(($ht_cap & 32))" -eq 32 ] && append ht_capab "$list	SHORT-GI-20" "$N"
 			[ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list	SHORT-GI-40" "$N"
+			[ "$(($ht_cap & 128))" -eq 128 ] && append ht_capab "$list	TX-STBC" "$N"
+			[ "$(($ht_cap & 768))" -eq 256 ] && append ht_capab "$list	RX-STBC1" "$N"
+			[ "$(($ht_cap & 768))" -eq 512 ] && append ht_capab "$list	RX-STBC12" "$N"
+			[ "$(($ht_cap & 768))" -eq 768 ] && append ht_capab "$list	RX-STBC123" "$N"
 			[ "$(($ht_cap & 4096))" -eq 4096 ] && append ht_capab "$list	DSSS_CCK-40" "$N"
 		}
 		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }