Changeset 15200


Ignore:
Timestamp:
2009-04-10T14:48:24+02:00 (9 years ago)
Author:
nico
Message:

merge r15028 to 8.09 (close: #4777)

Location:
branches/8.09/package
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/base-files/Makefile

    r13904 r15200  
    11# 
    2 # Copyright (C) 2007 OpenWrt.org 
     2# Copyright (C) 2007-2009 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1111 
    1212PKG_NAME:=base-files 
    13 PKG_RELEASE:=14 
     13PKG_RELEASE:=15 
    1414 
    1515PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • branches/8.09/package/base-files/files/lib/network/config.sh

    r13375 r15200  
    232232        config_get mtu "$config" mtu 
    233233        config_get macaddr "$config" macaddr 
     234        macaddr="${macaddr:-$3}" 
    234235        grep "$iface:" /proc/net/dev > /dev/null && \ 
    235236                $DEBUG ifconfig "$iface" down && \ 
  • branches/8.09/package/base-files/files/sbin/wifi

    r13080 r15200  
    7171        include /lib/network 
    7272        scan_interfaces 
    73         setup_interface "$1" "$2" 
     73        setup_interface "$1" "$2" "$3" 
    7474)} 
    7575 
  • branches/8.09/package/broadcom-wl/Makefile

    r14312 r15200  
    1212PKG_NAME:=broadcom-wl 
    1313PKG_VERSION:=4.150.10.5.3 
    14 PKG_RELEASE:=2 
     14PKG_RELEASE:=3 
    1515WLC_VERSION:=0.1 
    1616 
  • branches/8.09/package/broadcom-wl/files/lib/wifi/broadcom.sh

    r14312 r15200  
    250250                [ -z "$net_cfg" ] || { 
    251251                        bridge="$(bridge_interface "$net_cfg")" 
    252                         append if_up "start_net '$ifname' '$net_cfg'" ";$N" 
    253252                        append if_up "set_wifi_up '$vif' '$ifname'" ";$N" 
     253                        append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N" 
    254254                } 
    255255                [ -z "$nasopts" ] || { 
Note: See TracChangeset for help on using the changeset viewer.