From 7aaee73bda9da89b90d895921f0bd0a254405cb6 Mon Sep 17 00:00:00 2001 From: adrian Date: Sun, 4 Oct 2015 04:25:56 +0000 Subject: Fix to compile using gcc-4.2 (eg mips, sparc64.) --- sys/dev/usb/wlan/if_run.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'sys/dev/usb/wlan/if_run.c') diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index 3b348b2..e620afd 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -2162,8 +2162,8 @@ run_wme_update_cb(void *arg) { struct ieee80211com *ic = arg; struct run_softc *sc = ic->ic_softc; - const struct wmeParams (*ac)[WME_NUM_AC] = - &ic->ic_wme.wme_chanParams.cap_wmeParams; + const struct wmeParams *ac = + ic->ic_wme.wme_chanParams.cap_wmeParams; int aci, error = 0; RUN_LOCK_ASSERT(sc, MA_OWNED); @@ -2171,39 +2171,39 @@ run_wme_update_cb(void *arg) /* update MAC TX configuration registers */ for (aci = 0; aci < WME_NUM_AC; aci++) { error = run_write(sc, RT2860_EDCA_AC_CFG(aci), - ac[aci]->wmep_logcwmax << 16 | - ac[aci]->wmep_logcwmin << 12 | - ac[aci]->wmep_aifsn << 8 | - ac[aci]->wmep_txopLimit); + ac[aci].wmep_logcwmax << 16 | + ac[aci].wmep_logcwmin << 12 | + ac[aci].wmep_aifsn << 8 | + ac[aci].wmep_txopLimit); if (error) goto err; } /* update SCH/DMA registers too */ error = run_write(sc, RT2860_WMM_AIFSN_CFG, - ac[WME_AC_VO]->wmep_aifsn << 12 | - ac[WME_AC_VI]->wmep_aifsn << 8 | - ac[WME_AC_BK]->wmep_aifsn << 4 | - ac[WME_AC_BE]->wmep_aifsn); + ac[WME_AC_VO].wmep_aifsn << 12 | + ac[WME_AC_VI].wmep_aifsn << 8 | + ac[WME_AC_BK].wmep_aifsn << 4 | + ac[WME_AC_BE].wmep_aifsn); if (error) goto err; error = run_write(sc, RT2860_WMM_CWMIN_CFG, - ac[WME_AC_VO]->wmep_logcwmin << 12 | - ac[WME_AC_VI]->wmep_logcwmin << 8 | - ac[WME_AC_BK]->wmep_logcwmin << 4 | - ac[WME_AC_BE]->wmep_logcwmin); + ac[WME_AC_VO].wmep_logcwmin << 12 | + ac[WME_AC_VI].wmep_logcwmin << 8 | + ac[WME_AC_BK].wmep_logcwmin << 4 | + ac[WME_AC_BE].wmep_logcwmin); if (error) goto err; error = run_write(sc, RT2860_WMM_CWMAX_CFG, - ac[WME_AC_VO]->wmep_logcwmax << 12 | - ac[WME_AC_VI]->wmep_logcwmax << 8 | - ac[WME_AC_BK]->wmep_logcwmax << 4 | - ac[WME_AC_BE]->wmep_logcwmax); + ac[WME_AC_VO].wmep_logcwmax << 12 | + ac[WME_AC_VI].wmep_logcwmax << 8 | + ac[WME_AC_BK].wmep_logcwmax << 4 | + ac[WME_AC_BE].wmep_logcwmax); if (error) goto err; error = run_write(sc, RT2860_WMM_TXOP0_CFG, - ac[WME_AC_BK]->wmep_txopLimit << 16 | - ac[WME_AC_BE]->wmep_txopLimit); + ac[WME_AC_BK].wmep_txopLimit << 16 | + ac[WME_AC_BE].wmep_txopLimit); if (error) goto err; error = run_write(sc, RT2860_WMM_TXOP1_CFG, - ac[WME_AC_VO]->wmep_txopLimit << 16 | - ac[WME_AC_VI]->wmep_txopLimit); + ac[WME_AC_VO].wmep_txopLimit << 16 | + ac[WME_AC_VI].wmep_txopLimit); err: if (error) -- cgit v1.1