KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sync macs with vif bssids in broadcom.sh, fixes multi-ssid with wpa

Browse source 
SVN-Revision: 15028
This commit is contained in:
Jo-Philipp Wich 2009-03-24 23:42:09 +00:00
parent 28b9fea4e7
commit 7e6c947e4b
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/base-files/files/lib/network/config.sh
View file

@ -231,6 +231,7 @@ setup_interface() {
# Interface settings # Interface settings
config_get mtu "$config" mtu config_get mtu "$config" mtu
config_get macaddr "$config" macaddr config_get macaddr "$config" macaddr
macaddr="${macaddr:-$3}"
grep "$iface:" /proc/net/dev > /dev/null && \ grep "$iface:" /proc/net/dev > /dev/null && \
$DEBUG ifconfig "$iface" down && \ $DEBUG ifconfig "$iface" down && \
$DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up

2
package/base-files/files/sbin/wifi
View file

@ -70,7 +70,7 @@ start_net() {(
[ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null [ -f "/var/run/$iface.pid" ] && kill "$(cat /var/run/${iface}.pid)" 2>/dev/null
include /lib/network include /lib/network
scan_interfaces scan_interfaces
setup_interface "$1" "$2" setup_interface "$1" "$2" "$3"
)} )}
set_wifi_up() { set_wifi_up() {

2
package/broadcom-wl/files/lib/wifi/broadcom.sh
View file

@ -251,8 +251,8 @@ enable_broadcom() {
net_cfg="$(find_net_config "$vif")" net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || { [ -z "$net_cfg" ] || {
bridge="$(bridge_interface "$net_cfg")" bridge="$(bridge_interface "$net_cfg")"
append if_up "start_net '$ifname' '$net_cfg'" ";$N"
append if_up "set_wifi_up '$vif' '$ifname'" ";$N" append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N"
} }
[ -z "$nasopts" ] || { [ -z "$nasopts" ] || {
eval "${vif}_ssid=\"\$ssid\"" eval "${vif}_ssid=\"\$ssid\""