From owner-svn-src-all@freebsd.org Sun Oct 4 04:29:45 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B681EA0E633; Sun, 4 Oct 2015 04:29:45 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C1D31831; Sun, 4 Oct 2015 04:29:45 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t944Tj19095250; Sun, 4 Oct 2015 04:29:45 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t944TjLA095249; Sun, 4 Oct 2015 04:29:45 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201510040429.t944TjLA095249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 4 Oct 2015 04:29:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288647 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2015 04:29:45 -0000 Author: adrian Date: Sun Oct 4 04:29:44 2015 New Revision: 288647 URL: https://svnweb.freebsd.org/changeset/base/288647 Log: Fix to make compile on gcc-4.2.1 (eg mips, sparc64.) Modified: head/sys/dev/usb/wlan/if_rum.c Modified: head/sys/dev/usb/wlan/if_rum.c ============================================================================== --- head/sys/dev/usb/wlan/if_rum.c Sun Oct 4 04:25:56 2015 (r288646) +++ head/sys/dev/usb/wlan/if_rum.c Sun Oct 4 04:29:44 2015 (r288647) @@ -2086,38 +2086,40 @@ rum_update_slot(struct ieee80211com *ic) static void rum_wme_update_cb(struct rum_softc *sc, union sec_param *data, uint8_t rvp_id) { - const struct wmeParams (*chanp)[WME_NUM_AC] = &data->wme_params; + struct ieee80211com *ic = &sc->sc_ic; + const struct wmeParams *chanp = + ic->ic_wme.wme_chanParams.cap_wmeParams; int error = 0; error = rum_write(sc, RT2573_AIFSN_CSR, - chanp[WME_AC_VO]->wmep_aifsn << 12 | - chanp[WME_AC_VI]->wmep_aifsn << 8 | - chanp[WME_AC_BK]->wmep_aifsn << 4 | - chanp[WME_AC_BE]->wmep_aifsn); + chanp[WME_AC_VO].wmep_aifsn << 12 | + chanp[WME_AC_VI].wmep_aifsn << 8 | + chanp[WME_AC_BK].wmep_aifsn << 4 | + chanp[WME_AC_BE].wmep_aifsn); if (error) goto print_err; error = rum_write(sc, RT2573_CWMIN_CSR, - chanp[WME_AC_VO]->wmep_logcwmin << 12 | - chanp[WME_AC_VI]->wmep_logcwmin << 8 | - chanp[WME_AC_BK]->wmep_logcwmin << 4 | - chanp[WME_AC_BE]->wmep_logcwmin); + chanp[WME_AC_VO].wmep_logcwmin << 12 | + chanp[WME_AC_VI].wmep_logcwmin << 8 | + chanp[WME_AC_BK].wmep_logcwmin << 4 | + chanp[WME_AC_BE].wmep_logcwmin); if (error) goto print_err; error = rum_write(sc, RT2573_CWMAX_CSR, - chanp[WME_AC_VO]->wmep_logcwmax << 12 | - chanp[WME_AC_VI]->wmep_logcwmax << 8 | - chanp[WME_AC_BK]->wmep_logcwmax << 4 | - chanp[WME_AC_BE]->wmep_logcwmax); + chanp[WME_AC_VO].wmep_logcwmax << 12 | + chanp[WME_AC_VI].wmep_logcwmax << 8 | + chanp[WME_AC_BK].wmep_logcwmax << 4 | + chanp[WME_AC_BE].wmep_logcwmax); if (error) goto print_err; error = rum_write(sc, RT2573_TXOP01_CSR, - chanp[WME_AC_BK]->wmep_txopLimit << 16 | - chanp[WME_AC_BE]->wmep_txopLimit); + chanp[WME_AC_BK].wmep_txopLimit << 16 | + chanp[WME_AC_BE].wmep_txopLimit); if (error) goto print_err; error = rum_write(sc, RT2573_TXOP23_CSR, - chanp[WME_AC_VO]->wmep_txopLimit << 16 | - chanp[WME_AC_VI]->wmep_txopLimit); + chanp[WME_AC_VO].wmep_txopLimit << 16 | + chanp[WME_AC_VI].wmep_txopLimit); if (error) goto print_err; @@ -2134,10 +2136,8 @@ static int rum_wme_update(struct ieee80211com *ic) { struct rum_softc *sc = ic->ic_softc; - const struct wmeParams (*chanp)[WME_NUM_AC] = - &ic->ic_wme.wme_chanParams.cap_wmeParams; - rum_cmd_sleepable(sc, chanp, sizeof (*chanp), 0, rum_wme_update_cb); + rum_cmd_sleepable(sc, NULL, 0, 0, rum_wme_update_cb); return (0); }