svn commit: r206416 - head/sys/dev/wpi
Rui Paulo
rpaulo at FreeBSD.org
Fri Apr 9 11:47:03 UTC 2010
Author: rpaulo
Date: Fri Apr 9 11:47:03 2010
New Revision: 206416
URL: http://svn.freebsd.org/changeset/base/206416
Log:
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
Modified:
head/sys/dev/wpi/if_wpi.c
Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c Fri Apr 9 11:29:16 2010 (r206415)
+++ head/sys/dev/wpi/if_wpi.c Fri Apr 9 11:47:03 2010 (r206416)
@@ -174,6 +174,7 @@ static int wpi_alloc_tx_ring(struct wpi_
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;
More information about the svn-src-head
mailing list