From nobody Wed Apr 6 03:42:59 2022 X-Original-To: dev-commits-src-all@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 C26F11A91754; Wed, 6 Apr 2022 03:43:01 +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 4KY9MS4Fj4z4sJg; Wed, 6 Apr 2022 03:43:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216580; 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=UqFoxT4fI48i/RCqhz/VFE5jYSezwl12OxQrya68CKg=; b=EOkaBKSxBkDvpM7kcwvPc3bZfm14SkHJjw2IUQ9zjT5yqc88itVAnI+Ir9xRs+dls6zTbd WkD5f07/ZewecSX09LP/Bt0fSD0itrYZVrt8IQUyJlzVAZaUPaqSDIBoOXpDQwcYVaVq6J zJo0qsMpZv9I+K9O9NWTfQCYhn4jUZe/q9+xZKwcus80gag94I6bKExmr9GzkqkPo3iiyP XZ658uR2BVqkgomgIU5DAfIhTtDzqhh/YxGRtSu+LpW6qj8EpiNrVVRspN3lEX18KL0yOP w3ZAa4F95HhVYOFqYOGx17I1a2T7cYN2N9o9aFrIazoCv+mqshrTGDIopaD3dA== 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 F00D8139CA; Wed, 6 Apr 2022 03:42:59 +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 2363gxK5089240; Wed, 6 Apr 2022 03:42:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2363gxnB089239; Wed, 6 Apr 2022 03:42:59 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:42:59 GMT Message-Id: <202204060342.2363gxnB089239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fba6f8efb674 - main - malo: Remove write only variables, but leave hardware reads in place List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba6f8efb674772b3deff0b5f5674c73d1b0624d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216580; 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=UqFoxT4fI48i/RCqhz/VFE5jYSezwl12OxQrya68CKg=; b=nJXfz0gXe0O/Qh5x03qyo+o8XzCn3gWKMwWuWcEZqC0fh/Tw4+GSExmZIEYaPluC+cZxhH vrBDazc9h/Js3rPkLoUhGLskYIywxPt6HftJwUsyvG7/Zu4XmEhJupQ68E5eWRUzfxHkZR l2fbQit5AZ8lgBfv9JsTrVVuM6x3Kz3/zuo0A6+9qXMGh5U8QlBLIImHq7cnb3ZGzZeXoE 9gEhCXdDt0l2ydt+K6AZVbFapU+MNowtZ07RXoIt9dBkgrRS2+LcmzYbWeJR4dHEBr1l7l E+6DmPA3DxmtvuI4U/ivQCPBD8gZZIKe2uKpVlx12wjvvuAtthR62NX6Ho3UgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649216580; a=rsa-sha256; cv=none; b=qeYrQ7cTYU+nf1eA6C2yxsZQV4M0s/b7ich+xe1VX6YC8tOwu0ppoAMm5pQIc5hZ9gKFKY zVSSg9+4+J/d21rc9yMaNzBklIMu0C1T1YxUS7IPFF6ZfGGdDemYuIMu5idwqyphyO3cLF y3nZbk8MSzenTQkckEvZ0sQewndX42ZSkBPGm4FrM1I+aUnWnQxpU+PS35SOjDCgRFUsoH 0TiahRP8BlPJ3NkpFCYbsITonD1fplkFF/B8S6PyUKGZib+n82zJkqgIMZOoCCsHt4ARxw fRiJBh6Riz0qRDRrXzmuVifW1TPNHmDTvInBfAH3psRIeBQ7UBPpoyBvt9DAmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fba6f8efb674772b3deff0b5f5674c73d1b0624d commit fba6f8efb674772b3deff0b5f5674c73d1b0624d Author: Warner Losh AuthorDate: 2022-04-06 02:01:22 +0000 Commit: Warner Losh CommitDate: 2022-04-06 03:42:05 +0000 malo: Remove write only variables, but leave hardware reads in place Sponsored by: Netflix --- sys/dev/malo/if_malo.c | 9 +++------ sys/dev/malo/if_malohal.c | 10 ++++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c index 0b5d7e9d950d..89c48c04db7f 100644 --- a/sys/dev/malo/if_malo.c +++ b/sys/dev/malo/if_malo.c @@ -1032,8 +1032,8 @@ malo_tx_start(struct malo_softc *sc, struct ieee80211_node *ni, { #define IS_DATA_FRAME(wh) \ ((wh->i_fc[0] & (IEEE80211_FC0_TYPE_MASK)) == IEEE80211_FC0_TYPE_DATA) - int error, ismcast, iswep; - int copyhdrlen, hdrlen, pktlen; + int error, iswep; + int hdrlen, pktlen; struct ieee80211_frame *wh; struct ieee80211com *ic = &sc->malo_ic; struct ieee80211vap *vap = ni->ni_vap; @@ -1044,13 +1044,10 @@ malo_tx_start(struct malo_softc *sc, struct ieee80211_node *ni, wh = mtod(m0, struct ieee80211_frame *); iswep = wh->i_fc[1] & IEEE80211_FC1_PROTECTED; - ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1); - copyhdrlen = hdrlen = ieee80211_anyhdrsize(wh); + hdrlen = ieee80211_anyhdrsize(wh); pktlen = m0->m_pkthdr.len; if (IEEE80211_QOS_HAS_SEQ(wh)) { qos = *(uint16_t *)ieee80211_getqos(wh); - if (IEEE80211_IS_DSTODS(wh)) - copyhdrlen -= sizeof(qos); } else qos = 0; diff --git a/sys/dev/malo/if_malohal.c b/sys/dev/malo/if_malohal.c index ed74a7324b2c..7fb8537f4cd3 100644 --- a/sys/dev/malo/if_malohal.c +++ b/sys/dev/malo/if_malohal.c @@ -178,13 +178,12 @@ fail: static void malo_hal_send_cmd(struct malo_hal *mh) { - uint32_t dummy; bus_dmamap_sync(mh->mh_dmat, mh->mh_dmamap, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); malo_hal_write4(mh, MALO_REG_GEN_PTR, mh->mh_cmdaddr); - dummy = malo_hal_read4(mh, MALO_REG_INT_CODE); + malo_hal_read4(mh, MALO_REG_INT_CODE); malo_hal_write4(mh, MALO_REG_H2A_INTERRUPT_EVENTS, MALO_H2ARIC_BIT_DOOR_BELL); @@ -309,19 +308,18 @@ malo_hal_fw_reset(struct malo_hal *mh) static void malo_hal_trigger_pcicmd(struct malo_hal *mh) { - uint32_t dummy; bus_dmamap_sync(mh->mh_dmat, mh->mh_dmamap, BUS_DMASYNC_PREWRITE); malo_hal_write4(mh, MALO_REG_GEN_PTR, mh->mh_cmdaddr); - dummy = malo_hal_read4(mh, MALO_REG_INT_CODE); + malo_hal_read4(mh, MALO_REG_INT_CODE); malo_hal_write4(mh, MALO_REG_INT_CODE, 0x00); - dummy = malo_hal_read4(mh, MALO_REG_INT_CODE); + malo_hal_read4(mh, MALO_REG_INT_CODE); malo_hal_write4(mh, MALO_REG_H2A_INTERRUPT_EVENTS, MALO_H2ARIC_BIT_DOOR_BELL); - dummy = malo_hal_read4(mh, MALO_REG_INT_CODE); + malo_hal_read4(mh, MALO_REG_INT_CODE); } static int