From owner-svn-src-all@freebsd.org Thu Oct 29 04:21:35 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 AEED7A20B53; Thu, 29 Oct 2015 04:21:35 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 87E641436; Thu, 29 Oct 2015 04:21:35 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9T4LYr3046506; Thu, 29 Oct 2015 04:21:34 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9T4LYaO046504; Thu, 29 Oct 2015 04:21:34 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201510290421.t9T4LYaO046504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Thu, 29 Oct 2015 04:21:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290133 - head/sys/dev/ral 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: Thu, 29 Oct 2015 04:21:35 -0000 Author: kevlo Date: Thu Oct 29 04:21:34 2015 New Revision: 290133 URL: https://svnweb.freebsd.org/changeset/base/290133 Log: - Add a missing prototype - Fix typos Modified: head/sys/dev/ral/rt2860.c head/sys/dev/ral/rt2860var.h Modified: head/sys/dev/ral/rt2860.c ============================================================================== --- head/sys/dev/ral/rt2860.c Thu Oct 29 04:16:52 2015 (r290132) +++ head/sys/dev/ral/rt2860.c Thu Oct 29 04:21:34 2015 (r290133) @@ -115,6 +115,7 @@ static void rt2860_tx_intr(struct rt2860 static void rt2860_rx_intr(struct rt2860_softc *); static void rt2860_tbtt_intr(struct rt2860_softc *); static void rt2860_gp_intr(struct rt2860_softc *); +static void rt2860_intr(void *); static int rt2860_tx(struct rt2860_softc *, struct mbuf *, struct ieee80211_node *); static int rt2860_raw_xmit(struct ieee80211_node *, struct mbuf *, @@ -513,7 +514,7 @@ rt2860_alloc_tx_ring(struct rt2860_softc BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, size, 1, size, 0, NULL, NULL, &ring->desc_dmat); if (error != 0) { - device_printf(sc->sc_dev, "could not create desc DMA map\n"); + device_printf(sc->sc_dev, "could not create desc DMA tag\n"); goto fail; } @@ -1386,7 +1387,7 @@ rt2860_gp_intr(struct rt2860_softc *sc) rt2860_updatestats(sc); } -void +static void rt2860_intr(void *arg) { struct rt2860_softc *sc = arg; @@ -1699,7 +1700,7 @@ rt2860_raw_xmit(struct ieee80211_node *n RAL_LOCK(sc); /* prevent management frames from being sent if we're not ready */ - if (!(sc->sc_flags & RT2860_RUNNNING)) { + if (!(sc->sc_flags & RT2860_RUNNING)) { RAL_UNLOCK(sc); m_freem(m); return ENETDOWN; @@ -1940,7 +1941,7 @@ rt2860_transmit(struct ieee80211com *ic, int error; RAL_LOCK(sc); - if ((sc->sc_flags & RT2860_RUNNNING) == 0) { + if ((sc->sc_flags & RT2860_RUNNING) == 0) { RAL_UNLOCK(sc); return (ENXIO); } @@ -1963,7 +1964,7 @@ rt2860_start(struct rt2860_softc *sc) RAL_LOCK_ASSERT(sc); - if ((sc->sc_flags & RT2860_RUNNNING) == 0) + if ((sc->sc_flags & RT2860_RUNNING) == 0) return; while (!SLIST_EMPTY(&sc->data_pool) && sc->qfullmsk == 0 && @@ -1986,7 +1987,7 @@ rt2860_watchdog(void *arg) RAL_LOCK_ASSERT(sc); - KASSERT(sc->sc_flags & RT2860_RUNNNING, ("not running")); + KASSERT(sc->sc_flags & RT2860_RUNNING, ("not running")); if (sc->sc_invalid) /* card ejected */ return; @@ -2009,12 +2010,12 @@ rt2860_parent(struct ieee80211com *ic) RAL_LOCK(sc); if (ic->ic_nrunning> 0) { - if (!(sc->sc_flags & RT2860_RUNNNING)) { + if (!(sc->sc_flags & RT2860_RUNNING)) { rt2860_init_locked(sc); startall = 1; } else rt2860_update_promisc(ic); - } else if (sc->sc_flags & RT2860_RUNNNING) + } else if (sc->sc_flags & RT2860_RUNNING) rt2860_stop_locked(sc); RAL_UNLOCK(sc); if (startall) @@ -3791,7 +3792,7 @@ rt2860_init(void *arg) rt2860_init_locked(sc); RAL_UNLOCK(sc); - if (sc->sc_flags & RT2860_RUNNNING) + if (sc->sc_flags & RT2860_RUNNING) ieee80211_start_all(ic); } @@ -4051,7 +4052,7 @@ rt2860_init_locked(struct rt2860_softc * if (sc->sc_flags & RT2860_ADVANCED_PS) rt2860_mcu_cmd(sc, RT2860_MCU_CMD_PSLEVEL, sc->pslevel, 0); - sc->sc_flags |= RT2860_RUNNNING; + sc->sc_flags |= RT2860_RUNNING; callout_reset(&sc->watchdog_ch, hz, rt2860_watchdog, sc); } @@ -4072,12 +4073,12 @@ rt2860_stop_locked(struct rt2860_softc * uint32_t tmp; int qid; - if (sc->sc_flags & RT2860_RUNNNING) + if (sc->sc_flags & RT2860_RUNNING) rt2860_set_leds(sc, 0); /* turn all LEDs off */ callout_stop(&sc->watchdog_ch); sc->sc_tx_timer = 0; - sc->sc_flags &= ~RT2860_RUNNNING; + sc->sc_flags &= ~RT2860_RUNNING; /* disable interrupts */ RAL_WRITE(sc, RT2860_INT_MASK, 0); Modified: head/sys/dev/ral/rt2860var.h ============================================================================== --- head/sys/dev/ral/rt2860var.h Thu Oct 29 04:16:52 2015 (r290132) +++ head/sys/dev/ral/rt2860var.h Thu Oct 29 04:21:34 2015 (r290133) @@ -139,7 +139,7 @@ struct rt2860_softc { #define RT2860_ENABLED (1 << 0) #define RT2860_ADVANCED_PS (1 << 1) #define RT2860_PCIE (1 << 2) -#define RT2860_RUNNNING (1 << 3) +#define RT2860_RUNNING (1 << 3) struct ieee80211_node *wcid2ni[RT2860_WCID_MAX];