summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d46e7f9)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@29029
3c298f89-4303-0410-b956-
a3cf2f4a3e73
PKG_REV:=3314
PKG_VERSION:=r$(PKG_REV)
PKG_REV:=3314
PKG_VERSION:=r$(PKG_REV)
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)
local device="$1"
local wds
local adhoc ahdemo sta ap monitor disabled
local device="$1"
local wds
local adhoc ahdemo sta ap monitor disabled
config_get vifs "$device" vifs
for vif in $vifs; do
config_get_bool disabled "$vif" disabled 0
[ $disabled = 0 ] || continue
config_get vifs "$device" vifs
for vif in $vifs; do
config_get_bool disabled "$vif" disabled 0
[ $disabled = 0 ] || continue
+ local vifname
+ [ $ifidx -gt 0 ] && vifname="ath${device#wifi}-$ifidx" || vifname="ath${device#wifi}"
+
config_get ifname "$vif" ifname
config_get ifname "$vif" ifname
- config_set "$vif" ifname "${ifname:-ath}"
+ config_set "$vif" ifname "${ifname:-$vifname}"
config_get mode "$vif" mode
case "$mode" in
config_get mode "$vif" mode
case "$mode" in
;;
*) echo "$device($vif): Invalid mode, ignored."; continue;;
esac
;;
*) echo "$device($vif): Invalid mode, ignored."; continue;;
esac
+
+ ifidx=$(($ifidx + 1))
done
case "${adhoc:+1}:${sta:+1}:${ap:+1}" in
done
case "${adhoc:+1}:${sta:+1}:${ap:+1}" in
esac
[ "$nosbeacon" = 1 ] || nosbeacon=""
esac
[ "$nosbeacon" = 1 ] || nosbeacon=""
- ifname=$(wlanconfig "$ifname" create wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
+ ifname=$(wlanconfig "$ifname" create nounit wlandev "$device" wlanmode "$mode" ${nosbeacon:+nosbeacon})
[ $? -ne 0 ] && {
echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2
continue
[ $? -ne 0 ] && {
echo "enable_atheros($device): Failed to set up $mode vif $ifname" >&2
continue