diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2015-05-25 17:06:52 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2015-05-25 17:06:52 +0000 |
| commit | b66af287ad63260cc2642736d7bbb4cd18a48deb (patch) | |
| tree | 8a71c5173a69162bb7def2ea3a385d9a0c39ce8d | |
| parent | c79f192c095af3284e59367e99632020e445ddd1 (diff) | |
| download | src-b66af287ad63260cc2642736d7bbb4cd18a48deb.tar.gz src-b66af287ad63260cc2642736d7bbb4cd18a48deb.zip | |
Update wpi(4) to use the new mgmt RX API.
Notes
Notes:
svn path=/head/; revision=283536
| -rw-r--r-- | sys/dev/wpi/if_wpi.c | 12 | ||||
| -rw-r--r-- | sys/dev/wpi/if_wpivar.h | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c index 164331ff6968..fe8bd5aee019 100644 --- a/sys/dev/wpi/if_wpi.c +++ b/sys/dev/wpi/if_wpi.c @@ -177,8 +177,9 @@ static int wpi_add_node_entry_adhoc(struct wpi_softc *); static struct ieee80211_node *wpi_node_alloc(struct ieee80211vap *, const uint8_t mac[IEEE80211_ADDR_LEN]); static void wpi_node_free(struct ieee80211_node *); -static void wpi_recv_mgmt(struct ieee80211_node *, struct mbuf *, int, int, - int); +static void wpi_recv_mgmt(struct ieee80211_node *, struct mbuf *, int, + const struct ieee80211_rx_stats *, + int, int); static void wpi_restore_node(void *, struct ieee80211_node *); static void wpi_restore_node_table(struct wpi_softc *, struct wpi_vap *); static int wpi_newstate(struct ieee80211vap *, enum ieee80211_state, int); @@ -1693,15 +1694,16 @@ wpi_check_bss_filter(struct wpi_softc *sc) } static void -wpi_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype, int rssi, - int nf) +wpi_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype, + const struct ieee80211_rx_stats *rxs, + int rssi, int nf) { struct ieee80211vap *vap = ni->ni_vap; struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc; struct wpi_vap *wvp = WPI_VAP(vap); uint64_t ni_tstamp, rx_tstamp; - wvp->wv_recv_mgmt(ni, m, subtype, rssi, nf); + wvp->wv_recv_mgmt(ni, m, subtype, rxs, rssi, nf); if (vap->iv_opmode == IEEE80211_M_IBSS && vap->iv_state == IEEE80211_S_RUN && diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h index 7a65b721f6c4..b7835281fb39 100644 --- a/sys/dev/wpi/if_wpivar.h +++ b/sys/dev/wpi/if_wpivar.h @@ -133,7 +133,9 @@ struct wpi_vap { int (*wv_newstate)(struct ieee80211vap *, enum ieee80211_state, int); void (*wv_recv_mgmt)(struct ieee80211_node *, - struct mbuf *, int, int, int); + struct mbuf *, int, + const struct ieee80211_rx_stats *, + int, int); }; #define WPI_VAP(vap) ((struct wpi_vap *)(vap)) |