svn commit: r283536 - head/sys/dev/wpi

[Adrian Chadd]

Author: adrian
Date: Mon May 25 17:06:52 2015
New Revision: 283536
URL: https://svnweb.freebsd.org/changeset/base/283536

Log:
  Update wpi(4) to use the new mgmt RX API.

Modified:
  head/sys/dev/wpi/if_wpi.c
  head/sys/dev/wpi/if_wpivar.h

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Mon May 25 16:37:41 2015	(r283535)
+++ head/sys/dev/wpi/if_wpi.c	Mon May 25 17:06:52 2015	(r283536)
@@ -177,8 +177,9 @@ static int	wpi_add_node_entry_adhoc(stru
 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 *s
 }
 
 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 &&

Modified: head/sys/dev/wpi/if_wpivar.h
==============================================================================
--- head/sys/dev/wpi/if_wpivar.h	Mon May 25 16:37:41 2015	(r283535)
+++ head/sys/dev/wpi/if_wpivar.h	Mon May 25 17:06:52 2015	(r283536)
@@ -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))