PERFORCE change 157433 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=157433

Change 157433 by hselasky at 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;