diff options
| author | sam <sam@FreeBSD.org> | 2009-03-29 17:59:14 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2009-03-29 17:59:14 +0000 |
| commit | 7edd0aa8efc500847d789aedf8904ab96a6fe234 (patch) | |
| tree | 8bb42581e6c46229c54ff76ee3fd9dd1e507f939 /sys/dev/usb/wlan/if_rum.c | |
| parent | cb768e2631a7f373d03c4b3c7fb251e76badc6a7 (diff) | |
| download | FreeBSD-src-7edd0aa8efc500847d789aedf8904ab96a6fe234.zip FreeBSD-src-7edd0aa8efc500847d789aedf8904ab96a6fe234.tar.gz | |
Eliminate ic_myaddr so changing the mac address of a device works correctly:
o remove ic_myaddr from ieee80211com
o change ieee80211_ifattach to take the mac address of the physical device
and use that to setup the lladdr.
o replace all references to ic_myaddr in drivers by IF_LLADDR
o related cleanups (e.g. kill dead code)
PR: kern/133178
Reviewed by: thompsa, rpaulo
Diffstat (limited to 'sys/dev/usb/wlan/if_rum.c')
| -rw-r--r-- | sys/dev/usb/wlan/if_rum.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index 659010c..bfe38a1 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -494,7 +494,6 @@ rum_attach_post(struct usb2_proc_msg *pm) 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 = @@ -516,7 +515,7 @@ rum_attach_post(struct usb2_proc_msg *pm) setbit(&bands, IEEE80211_MODE_11A); ieee80211_init_channels(ic, NULL, &bands); - ieee80211_ifattach(ic); + ieee80211_ifattach(ic, sc->sc_bssid); ic->ic_update_promisc = rum_update_promisc; ic->ic_newassoc = rum_newassoc; ic->ic_raw_xmit = rum_raw_xmit; @@ -2064,8 +2063,7 @@ rum_init_task(struct usb2_proc_msg *pm) /* clear STA registers */ rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof sc->sta); - IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp)); - rum_set_macaddr(sc, ic->ic_myaddr); + rum_set_macaddr(sc, IF_LLADDR(ifp)); /* initialize ASIC */ rum_write(sc, RT2573_MAC_CSR1, 4); |
