append $mode "$vif"
;;
wds)
- config_get addr "$vif" bssid
config_get ssid "$vif" ssid
- [ -z "$addr" -a -n "$ssid" ] && {
- config_set "$vif" wds 1
- config_set "$vif" mode sta
- mode="sta"
- addr="$ssid"
- }
+ [ -z "$ssid" ] && continue
+
+ config_set "$vif" wds 1
+ config_set "$vif" mode sta
+ mode="sta"
+ addr="$ssid"
${addr:+append $mode "$vif"}
;;
*) echo "$device($vif): Invalid mode, ignored."; continue;;
*) 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}"
}
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
}
local first=1
for vif in $vifs; do
+ local start_hostapd
nosbeacon=
config_get ifname "$vif" ifname
config_get enc "$vif" encryption
+ config_get eap_type "$vif" eap_type
config_get mode "$vif" mode
- [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
+ case "$mode" in
+ sta) config_get nosbeacon "$device" nosbeacon;;
+ adhoc) config_get nosbeacon "$vif" sw_merge;;
+ esac
config_get ifname "$vif" ifname
ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
}
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
+
+ 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;;
+ esac
+ iwpriv "$ifname" mode "$agmode"
+ iwpriv "$ifname" pureg "$pureg"
+
[ "$first" = 1 ] && {
- # only need to change freq band and channel on the first vif
- config_get agmode "$device" agmode
- [ -z "$agmode" ] && config_get agmode "$device" mode
-
- pureg=0
- case "$agmode" in
- *b) agmode=11b;;
- *bg) agmode=11g;;
- *g) agmode=11g; pureg=1;;
- *a) agmode=11a;;
- *) agmode=auto;;
- esac
- iwpriv "$ifname" mode "$agmode"
- iwpriv "$ifname" pureg "$pureg"
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
}
iwpriv "$ifname" ff "$ff"
fi
- config_get wdssep "$vif" wdssep
- [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
-
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;
esac
iwpriv "$ifname" wds "$wds"
- wpa=
+ [ "$mode" = ap -a "$wds" = 1 ] && {
+ config_get_bool wdssep "$vif" wdssep 1
+ [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+ }
+
case "$enc" in
WEP|wep)
for idx in 1 2 3 4; do
*) iwconfig "$ifname" enc "$key";;
esac
;;
- PSK|psk|PSK2|psk2)
+ psk*|wpa*)
+ start_hostapd=1
config_get key "$vif" key
;;
esac
case "$mode" in
- wds)
- config_get addr "$vif" bssid
- iwpriv "$ifname" wds_add "$addr"
- ;;
adhoc|ahdemo)
config_get addr "$vif" bssid
[ -z "$addr" ] || {
[ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan"
config_get_bool antdiv "$device" diversity
- [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&-
-
config_get antrx "$device" rxantenna
- [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&-
-
config_get anttx "$device" txantenna
+ config_get_bool softled "$device" softled 1
+
+ devname="$(cat /proc/sys/dev/$device/dev_name)"
+ antgpio=
+ case "$devname" in
+ NanoStation2) antgpio=7;;
+ NanoStation5) antgpio=1;;
+ esac
+ if [ -n "$antgpio" ]; then
+ softled=0
+ 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
+
+ [ -x "$(which gpioctl 2>/dev/null)" ] || antenna=
+ case "$antenna" in
+ 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
+ ;;
+ esac
+ fi
+
+ [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&-
+ [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&-
[ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&-
+ [ -n "$softled" ] && sysctl -w dev."$device".softled="$softled" >&-
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%%.*}"
esac
ifconfig "$ifname" up
+
+ # TXPower settings only work if device is up already
+ config_get txpwr "$vif" txpower
+ [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
+
local net_cfg bridge
net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
config_set "$vif" bridge "$bridge"
start_net "$ifname" "$net_cfg"
}
+ [ -n "$ssid" ] && iwconfig "$ifname" essid on
iwconfig "$ifname" essid "$ssid"
set_wifi_up "$vif" "$ifname"
case "$mode" in
config_get_bool isolate "$vif" isolate 0
iwpriv "$ifname" ap_bridge "$((isolate^1))"
- if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+ if [ -n "$start_hostapd" ] && eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
hostapd_setup_vif "$vif" madwifi || {
- echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
+ echo "enable_atheros($device): Failed to set up hostapd for interface $ifname" >&2
# make sure this wifi interface won't accidentally stay open without encryption
ifconfig "$ifname" down
wlanconfig "$ifname" destroy
fi
;;
wds|sta)
- config_get_bool usepassphrase "$vif" passphrase 1
- case "$enc" in
- PSK|psk|PSK2|psk2)
- case "$enc" in
- PSK|psk)
- proto='proto=WPA'
- if [ "$usepassphrase" = "1" ]; then
- passphrase="psk=\"${key}\""
- else
- passphrase="psk=${key}"
- fi
- ;;
- PSK2|psk2)
- proto='proto=RSN'
- if [ "$usepassphrase" = "1" ]; then
- passphrase="psk=\"${key}\""
- else
- passphrase="psk=${key}"
- fi
- ;;
- esac
- cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-network={
- scan_ssid=1
- ssid="$ssid"
- key_mgmt=WPA-PSK
- $proto
- $passphrase
-}
-EOF
- ;;
- WPA|wpa|WPA2|wpa2)
- #add wpa_supplicant calls here
- ;;
- esac
- [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+ if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+ wpa_supplicant_setup_vif "$vif" madwifi || {
+ echo "enable_atheros($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+ ifconfig "$ifname" down
+ wlanconfig "$ifname" destroy
+ continue
+ }
+ fi
;;
esac
first=0
[ -d ath ] || return
for dev in $(ls -d wifi* 2>&-); do
config_get type "$dev" type
+ devname="$(cat /proc/sys/dev/$dev/dev_name)"
+ case "$devname" in
+ NanoStation*)
+ EXTRA_DEV="
+# Ubiquiti NanoStation features
+ option antenna auto # (auto|horizontal|vertical|external)
+"
+ ;;
+ esac
[ "$type" = atheros ] && return
cat <<EOF
config wifi-device $dev
option type atheros
option channel auto
-
+$EXTRA_DEV
# REMOVE THIS LINE TO ENABLE WIFI:
option disabled 1
projects / openwrt.git / blobdiff