From owner-p4-projects@FreeBSD.ORG Mon Feb 9 14:18:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEFBA1065675; Mon, 9 Feb 2009 14:18:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A36B1065672 for ; Mon, 9 Feb 2009 14:18:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BC4E8FC08 for ; Mon, 9 Feb 2009 14:18:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n19EIs01093596 for ; Mon, 9 Feb 2009 14:18:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n19EIsaq093594 for perforce@freebsd.org; Mon, 9 Feb 2009 14:18:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Feb 2009 14:18:54 GMT Message-Id: <200902091418.n19EIsaq093594@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 157433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Feb 2009 14:18:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=157433 Change 157433 by hselasky@hselasky_laptop001 on 2009/02/09 14:18:31 Fix USB WLAN regression issue. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#28 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#28 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#28 (text+ko) ==== @@ -490,6 +490,7 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ + IEEE80211_ADDR_COPY(ic->ic_myaddr, sc->sc_bssid); /* set device capabilities */ ic->ic_caps = @@ -1827,15 +1828,13 @@ static void rum_read_eeprom(struct rum_softc *sc) { - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; uint16_t val; #ifdef RUM_DEBUG int i; #endif /* read MAC address */ - rum_eeprom_read(sc, RT2573_EEPROM_ADDRESS, ic->ic_myaddr, 6); + rum_eeprom_read(sc, RT2573_EEPROM_ADDRESS, sc->sc_bssid, 6); rum_eeprom_read(sc, RT2573_EEPROM_ANTENNA, &val, 2); val = le16toh(val); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#5 (text+ko) ==== @@ -127,6 +127,7 @@ uint32_t sta[6]; uint32_t rf_regs[4]; uint8_t txpow[44]; + uint8_t sc_bssid[6]; struct { uint8_t val; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#28 (text+ko) ==== @@ -476,6 +476,7 @@ ic->ic_ifp = ifp; ic->ic_phytype = IEEE80211_T_OFDM; /* not only, but not used */ + IEEE80211_ADDR_COPY(ic->ic_myaddr, sc->sc_bssid); /* set device capabilities */ ic->ic_caps = @@ -1978,8 +1979,6 @@ static void ural_read_eeprom(struct ural_softc *sc) { - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic = ifp->if_l2com; uint16_t val; ural_eeprom_read(sc, RAL_EEPROM_CONFIG0, &val, 2); @@ -1992,7 +1991,7 @@ sc->nb_ant = val & 0x3; /* read MAC address */ - ural_eeprom_read(sc, RAL_EEPROM_ADDRESS, ic->ic_myaddr, 6); + ural_eeprom_read(sc, RAL_EEPROM_ADDRESS, sc->sc_bssid, 6); /* read default values for BBP registers */ ural_eeprom_read(sc, RAL_EEPROM_BBP_BASE, sc->bbp_prom, 2 * 16); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#5 (text+ko) ==== @@ -130,6 +130,7 @@ uint16_t sta[11]; uint32_t rf_regs[4]; uint8_t txpow[14]; + uint8_t sc_bssid[6]; struct { uint8_t val;