From c9cacb2d3ccc1668c2dbb9a65e7e754e93285500 Mon Sep 17 00:00:00 2001 From: Rui Paulo Date: Fri, 9 Apr 2010 11:47:03 +0000 Subject: [PATCH] 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 --- sys/dev/wpi/if_wpi.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 33c801b5749..9bf9342140a 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; @@ -3194,6 +3196,14 @@ wpi_stop(struct wpi_softc *sc) WPI_UNLOCK(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) {