From nobody Tue Dec 14 14:24:29 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1895718EDDA5; Tue, 14 Dec 2021 14:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JD0xn5dsQz4ppt; Tue, 14 Dec 2021 14:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A14F11767; Tue, 14 Dec 2021 14:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEEOTq6007558; Tue, 14 Dec 2021 14:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEEOTXE007557; Tue, 14 Dec 2021 14:24:29 GMT (envelope-from git) Date: Tue, 14 Dec 2021 14:24:29 GMT Message-Id: <202112141424.1BEEOTXE007557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 4472999abe91 - main - ral: plug set-but-not-used vars List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4472999abe91f7378ce47c15d5db0ba633eb609c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639491869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GFG03wNbeYu+/EGMO7Em6V7hkDlwN921h7/Kfe9zpig=; b=nJkTMABtJVa/EiFRngZQ4iZV0dzvYEKt54keUOD7f1/QNJtjPPdVrCcXvbu5FfG1a/63T0 in4UWA1cH+EU3cd2g390AisZvlF2CpOjHJfeiTKA02pSq+PS8tDs6DSSuPcH9Rc1cqhyTm p9ohIFRbfwPRhYQeMcOGLY0JoNqWlb8Ar5JSNGhsH+4srAUMimmiwB+8MhjjZ7r7zDqJjO 9eXJqn9XDCk291cVCLBv1KZfimIhbc/nHu5nAxs7sBAO4lQ6pnA76OUjZb7L2KvGUkRQo9 8likVSOwHZZGKeTqSVMiJRZTbNmyz1hlbDrC8NIpDijOu9jfCINh0twvaWm2UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639491869; a=rsa-sha256; cv=none; b=MCL8mEn39cPXDTwgLVYxytC9ygwwOHY3pU2oVkrNnF82iozNMzucwyggXxdVAgmNCHvAXD KZKz784TEw/ttxAwiAs3Hd6UofZ4iPOZEKu3P9BJUFnjNwP/8Bb6JDi+AW0PfcBpZULi1s o5btPH+Mmb3c7U/1zMnGzOA9kVQdmhE9sLPEi40RZafdfvq+uZ5S7d+PQmATOypmuRAvdN 54M2SpYOcdA2uz4xSp85iLjVprrRziLz5IvQaC9z262nupSISzmVP6KNqPb5BxJOb1hKk3 7H4Nl8J5xBct5YcUKv01j8g8qts0GiBLszJ39subUqzs/IdD5iU7JU3B5+7Akw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4472999abe91f7378ce47c15d5db0ba633eb609c commit 4472999abe91f7378ce47c15d5db0ba633eb609c Author: Mateusz Guzik AuthorDate: 2021-12-14 14:23:16 +0000 Commit: Mateusz Guzik CommitDate: 2021-12-14 14:24:21 +0000 ral: plug set-but-not-used vars Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/ral/rt2860.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c index d83174e61d9e..ab7f0651c6c4 100644 --- a/sys/dev/ral/rt2860.c +++ b/sys/dev/ral/rt2860.c @@ -1468,7 +1468,7 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni) bus_dma_segment_t *seg; u_int hdrlen; uint16_t qos, dur; - uint8_t type, qsel, mcs, pid, tid, qid; + uint8_t type, qsel, mcs, pid, qid; int i, nsegs, ntxds, pad, rate, ridx, error; /* the data pool contains at least one element, pick the first */ @@ -1505,10 +1505,8 @@ rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni) qid = M_WME_GETAC(m); if (IEEE80211_QOS_HAS_SEQ(wh)) { qos = ((const struct ieee80211_qosframe *)wh)->i_qos[0]; - tid = qos & IEEE80211_QOS_TID; } else { qos = 0; - tid = 0; } ring = &sc->txq[qid]; ridx = ieee80211_legacy_rate_lookup(ic->ic_rt, rate); @@ -1742,7 +1740,7 @@ rt2860_tx_raw(struct rt2860_softc *sc, struct mbuf *m, bus_dma_segment_t *seg; u_int hdrlen; uint16_t dur; - uint8_t type, qsel, mcs, pid, tid, qid; + uint8_t qsel, mcs, pid, qid; int i, nsegs, ntxds, pad, rate, ridx, error; /* the data pool contains at least one element, pick the first */ @@ -1750,7 +1748,6 @@ rt2860_tx_raw(struct rt2860_softc *sc, struct mbuf *m, wh = mtod(m, struct ieee80211_frame *); hdrlen = ieee80211_hdrsize(wh); - type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK; /* Choose a TX rate index. */ rate = params->ibp_rate0; @@ -1763,7 +1760,6 @@ rt2860_tx_raw(struct rt2860_softc *sc, struct mbuf *m, } qid = params->ibp_pri & 3; - tid = 0; ring = &sc->txq[qid]; /* get MCS code from rate index */