X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/855a24be339f27e9ab0ccaf4619be1a1d2330a50..ac74991e5e88789fe6d66bf3194525cd77ddaa4e:/package/madwifi/files/lib/wifi/madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 1188e4f87..52086f04b 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -31,7 +31,7 @@ scan_atheros() {
 		esac
 	done
 
-	case "${adhoc:+1}:${sta:+1}:${ap+1}" in
+	case "${adhoc:+1}:${sta:+1}:${ap:+1}" in
 		# valid mode combinations
 		1::) wds="";;
 		1::1);;
@@ -42,7 +42,7 @@ scan_atheros() {
 		*) echo "$device: Invalid mode combination in config"; return 1;;
 	esac
 
-	config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
+	config_set "$device" vifs "${sta:+$sta }${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${wds:+$wds }${monitor:+$monitor}"
 }
 
 
@@ -50,18 +50,14 @@ disable_atheros() (
 	local device="$1"
 
 	set_wifi_down "$device"
-	# kill all running hostapd and wpa_supplicant processes that
-	# are running on atheros vifs 
-	for pid in `pidof hostapd wpa_supplicant`; do
-		grep ath /proc/$pid/cmdline >/dev/null && \
-			kill $pid
-	done
 	
 	include /lib/network
 	cd /proc/sys/net
 	for dev in *; do
 		grep "$device" "$dev/%parent" >/dev/null 2>/dev/null && {
-			ifconfig "$dev" down 
+			[ -f "/var/run/wifi-${dev}.pid" ] &&
+				kill "$(cat "/var/run/wifi-${dev}.pid")"
+			ifconfig "$dev" down
 			unbridge "$dev"
 			wlanconfig "$dev" destroy
 		}
@@ -71,14 +67,24 @@ disable_atheros() (
 
 enable_atheros() {
 	local device="$1"
+	# Can only set the country code to one setting for the entire system. The last country code is the one that will be applied.
+	config_get country "$device" country
+	[ -z "$country" ] && country="0"
+	local cc="0"
+	[ -e /proc/sys/dev/$device/countrycode ] && cc="$(cat /proc/sys/dev/$device/countrycode)"
+	if [ ! "$cc" = "$country" ] ; then
+		rmmod ath_pci
+		insmod ath_pci countrycode=$country
+	fi
 	config_get channel "$device" channel
 	config_get vifs "$device" vifs
+	config_get txpower "$device" txpower
 
 	[ auto = "$channel" ] && channel=0
 
 	local first=1
 	for vif in $vifs; do
-		local start_hostapd
+		local start_hostapd vif_txpower
 		nosbeacon=
 		config_get ifname "$vif" ifname
 		config_get enc "$vif" encryption
@@ -99,22 +105,22 @@ enable_atheros() {
 		config_set "$vif" ifname "$ifname"
 
 		# only need to change freq band and channel on the first vif
-		config_get agmode "$device" agmode
-		[ -z "$agmode" ] && config_get agmode "$device" mode
+		config_get hwmode "$device" hwmode
+		[ -z "$hwmode" ] && config_get hwmode "$device" mode
 
 		pureg=0
-		case "$agmode" in
-			*b) agmode=11b;;
-			*bg) agmode=11g;;
-			*g) agmode=11g; pureg=1;;
-			*gdt) agmode=11gdt;;
-			*a) agmode=11a;;
-			*adt) agmode=11adt;;
-			*ast) agmode=11ast;;
-			*fh) agmode=fh;;
-			*) agmode=auto;;
+		case "$hwmode" in
+			*b) hwmode=11b;;
+			*bg) hwmode=11g;;
+			*g) hwmode=11g; pureg=1;;
+			*gdt) hwmode=11gdt;;
+			*a) hwmode=11a;;
+			*adt) hwmode=11adt;;
+			*ast) hwmode=11ast;;
+			*fh) hwmode=fh;;
+			*) hwmode=auto;;
 		esac
-		iwpriv "$ifname" mode "$agmode"
+		iwpriv "$ifname" mode "$hwmode"
 		iwpriv "$ifname" pureg "$pureg"
 
 		[ "$first" = 1 ] && {
@@ -186,25 +192,23 @@ enable_atheros() {
 		esac
 		if [ -n "$antgpio" ]; then
 			softled=0
-			config_get polarity "$device" polarity
+			config_get antenna "$device" antenna
 			case "$antenna" in
+				external) antdiv=0; antrx=1; anttx=1 ;;
 				horizontal) antdiv=0; antrx=1; anttx=1 ;;
 				vertical) antdiv=0; antrx=2; anttx=2 ;;
 				auto) antdiv=1; antrx=0; anttx=0 ;;
 			esac
-			config_get antenna "$device" antenna
+			
 			[ -x "$(which gpioctl 2>/dev/null)" ] || antenna=
 			case "$antenna" in
-				internal)
+				horizontal|vertical|auto)
 					gpioctl "dirout" "$antgpio" >/dev/null 2>&1
 					gpioctl "set" "$antgpio" >/dev/null 2>&1
 				;;
 				external)
 					gpioctl "dirout" "$antgpio" >/dev/null 2>&1
 					gpioctl "clear" "$antgpio" >/dev/null 2>&1
-					antdiv=0
-					antrx=1
-					anttx=1
 				;;
 			esac
 		fi
@@ -217,9 +221,6 @@ enable_atheros() {
 		config_get distance "$device" distance
 		[ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
 
-		config_get txpwr "$vif" txpower
-		[ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
-
 		config_get rate "$vif" rate
 		[ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
 
@@ -259,6 +260,9 @@ enable_atheros() {
 		config_get_bool doth "$vif" doth 0
 		[ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
 
+		config_get_bool probereq "$vif" probereq
+		[ -n "$probereq" ] && iwpriv "$ifname" probereq "$probereq"
+
 		config_get maclist "$vif" maclist
 		[ -n "$maclist" ] && {
 			# flush MAC list
@@ -283,6 +287,7 @@ enable_atheros() {
 		esac
 
 		ifconfig "$ifname" up
+
 		local net_cfg bridge
 		net_cfg="$(find_net_config "$vif")"
 		[ -z "$net_cfg" ] || {
@@ -293,6 +298,17 @@ enable_atheros() {
 		[ -n "$ssid" ] && iwconfig "$ifname" essid on
 		iwconfig "$ifname" essid "$ssid"
 		set_wifi_up "$vif" "$ifname"
+
+		# TXPower settings only work if device is up already
+		# while atheros hardware theoretically is capable of per-vif (even per-packet) txpower
+		# adjustment it does not work with the current atheros hal/madwifi driver
+
+		config_get vif_txpower "$vif" txpower
+		# use vif_txpower (from wifi-iface) instead of txpower (from wifi-device) if
+		# the latter doesn't exist
+		txpower="${txpower:-$vif_txpower}"
+		[ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
+
 		case "$mode" in
 			ap)
 				config_get_bool isolate "$vif" isolate 0
@@ -334,8 +350,7 @@ detect_atheros() {
 			NanoStation*)
 				EXTRA_DEV="
 # Ubiquiti NanoStation features
-	option antenna	internal
-	option polarity	auto # (auto|horizontal|vertical)
+	option antenna	auto # (auto|horizontal|vertical|external)
 "
 			;;
 		esac