svn commit: r324571 - head/sys/dev/ath

[Adrian Chadd]

Author: adrian
Date: Thu Oct 12 21:58:51 2017
New Revision: 324571
URL: https://svnweb.freebsd.org/changeset/base/324571

Log:
  [ath] Begin using the replacement EDCA functions.
  
  As part of ath10k and other chipset support, the EDCA stuff has to be moved
  to potentially be per-VAP.  For hardware that doesn't support it (ie,
  everything that we currently support) it can just fetch the "current"
  global EDCA parameters for the NIC.
  
  This is one of those parameters that is linked to the currently active
  channel context / VAP in Linux mac80211 parlance.
  
  Tested:
  
  * ath(4), STA and AP modes

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Oct 12 21:56:58 2017	(r324570)
+++ head/sys/dev/ath/if_ath.c	Thu Oct 12 21:58:51 2017	(r324571)
@@ -4049,9 +4049,13 @@ ath_txq_update(struct ath_softc *sc, int ac)
 #define	ATH_EXPONENT_TO_VALUE(v)	((1<<v)-1)
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ath_txq *txq = sc->sc_ac2q[ac];
-	struct wmeParams *wmep = &ic->ic_wme.wme_chanParams.cap_wmeParams[ac];
+	struct chanAccParams chp;
+	struct wmeParams *wmep;
 	struct ath_hal *ah = sc->sc_ah;
 	HAL_TXQ_INFO qi;
+
+	ieee80211_wme_ic_getparams(ic, &chp);
+	wmep = &chp.cap_wmeParams[ac];
 
 	ath_hal_gettxqueueprops(ah, txq->axq_qnum, &qi);
 #ifdef IEEE80211_SUPPORT_TDMA