diff options
author | Rui Paulo <rpaulo@FreeBSD.org> | 2010-04-09 11:47:03 +0000 |
---|---|---|
committer | Rui Paulo <rpaulo@FreeBSD.org> | 2010-04-09 11:47:03 +0000 |
commit | c9cacb2d3ccc1668c2dbb9a65e7e754e93285500 (patch) | |
tree | 1a3f06893c8c42e28a043a97e16f97a417e1905e /sys/dev/wpi | |
parent | 49ee50b3efe997627e9408f90f46ba9adafb19fa (diff) | |
download | src-c9cacb2d3ccc1668c2dbb9a65e7e754e93285500.tar.gz src-c9cacb2d3ccc1668c2dbb9a65e7e754e93285500.zip |
Fix recent breakage: wpi_newassoc() wasn't supposed to be removed and
it needs to call ieee80211_ratectl_node_init().
Submitted by: bschmidt
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=206416
Diffstat (limited to 'sys/dev/wpi')
-rw-r--r-- | sys/dev/wpi/if_wpi.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 33c801b57492..9bf9342140ab 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -174,6 +174,7 @@ static int wpi_alloc_tx_ring(struct wpi_softc *, struct wpi_tx_ring *, int, int); static void wpi_reset_tx_ring(struct wpi_softc *, struct wpi_tx_ring *); static void wpi_free_tx_ring(struct wpi_softc *, struct wpi_tx_ring *); +static void wpi_newassoc(struct ieee80211_node *, int); static int wpi_newstate(struct ieee80211vap *, enum ieee80211_state, int); static void wpi_mem_lock(struct wpi_softc *); static void wpi_mem_unlock(struct wpi_softc *); @@ -667,6 +668,7 @@ wpi_attach(device_t dev) ieee80211_ifattach(ic, macaddr); /* override default methods */ ic->ic_raw_xmit = wpi_raw_xmit; + ic->ic_newassoc = wpi_newassoc; ic->ic_wme.wme_update = wpi_wme_update; ic->ic_scan_start = wpi_scan_start; ic->ic_scan_end = wpi_scan_end; @@ -3195,6 +3197,14 @@ wpi_stop(struct wpi_softc *sc) } static void +wpi_newassoc(struct ieee80211_node *ni, int isnew) +{ + + /* XXX move */ + ieee80211_ratectl_node_init(ni); +} + +static void wpi_calib_timeout(void *arg) { struct wpi_softc *sc = arg; |