From nobody Wed Dec 7 20:34:18 2022
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 4NS8CG71FQz4jmf5;
Wed, 7 Dec 2022 20:34:18 +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 4NS8CG2r9Rz3jV4;
Wed, 7 Dec 2022 20:34:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1670445258;
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=MpD8lZS1nlT08mCH0MXBPwqQnPRjq+kHC0ifNUcl44E=;
b=bJ3ZsVVB85065Absl6BRwQiL00utzj5Pejwa0V1AJpWVpQoFnXbbGw9fozbHZxPxqlDdcX
ECNWZFR+NUzaKobKF+SSaj7xdAHL3TmuC4CsX7pK6OjcBg71sPzxEOtHkvGqu2Urkd8YXp
6t8Fx3M0uNu5UEnfQSn1xI+YFtKc3L36bi/aamPljOC60zxI+EbFIAxvGngW5KTDiDeYS1
DPlTAIOigBb2W61PpToWYh6bnBKyH1C5rDeHwlSkDc1/hznIZaUCBNFbbPGJrTxQ0LIWAP
++jHdxB1psrqJo9vKQ56qJfyKdIozdDSn2sRXgVtcjIQ/yw7/7PlDFo8j3DiYw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1670445258;
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=MpD8lZS1nlT08mCH0MXBPwqQnPRjq+kHC0ifNUcl44E=;
b=rQskNhrUYJm2ZFIJ/J/51QFMH39bX/4mAmNdJZ/T3EYMDpV5RHKGqG3FUKkk86SB6n1ufR
jackmvkjnG5+KKu6YTKH1i7S2Hb8B2cFaW6ccKBaV3mudJEONG56hEOH7a9L1zCTuVXRmO
DwCxoqgYmjA0G10HnK8C5iTyYXb6DkW8A/2Lw/ZE6Vg2FlNBQhhnUaRbVx754PisqKCEQ9
84mKzRZbTNE07vzEhmohzRbcQCRlY3opdi6GdFNRfMDMj81IqE8D3Zy3sHTv6MT6cMEWU9
Nyq0pwyXE5ILUtHfiRPe3MlxBtKyRV6thmu9whIPS5awaHr0AGo423Z2yNHIfA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670445258; a=rsa-sha256; cv=none;
b=mJyaVCHvJJ8YP2aKoI3V8ERTL4T9I3hwq3/YAKo8+RroyY79FM6rJTEumzVPfjXGcYfdT/
4zu6Fn9M1J2tJxcE87StoujReb+iVbjYNljo0CPI1MydNsNFxG5OZmA9NRvjn6w91S2zy4
VCyfbx9GQslGjW6zSLKU1u7nnbVST9gierDoJoqzEDynpUeX78sMTQXRdJDzQRZCfxWrPf
Dnsx7AvcSXT0TCFXJ5jriejreAGdOLjsFQDWVjynxRGbFXNPS8R8KwmbLo2XP485JECncv
ps/RuL89ng7z63zXjPHKMyBcQFuh9AeNQTGJ0ayCYpCoF/2gP+DGoQYcJ0Dfww==
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 4NS8CG1pKtzVrL;
Wed, 7 Dec 2022 20:34:18 +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 2B7KYIfH088739;
Wed, 7 Dec 2022 20:34:18 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B7KYIWK088738;
Wed, 7 Dec 2022 20:34:18 GMT
(envelope-from git)
Date: Wed, 7 Dec 2022 20:34:18 GMT
Message-Id: <202212072034.2B7KYIWK088738@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 8bc615f5919f - main - rtwn: Fix mismatches in array bounds.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
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: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 8bc615f5919f027cdf09825764276ab41a38375e
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=8bc615f5919f027cdf09825764276ab41a38375e
commit 8bc615f5919f027cdf09825764276ab41a38375e
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-12-07 20:33:21 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-12-07 20:33:21 +0000
rtwn: Fix mismatches in array bounds.
Reported by: GCC -Warray-parameter
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D37550
---
sys/dev/rtwn/rtl8188e/r88e.h | 4 +++-
sys/dev/rtwn/rtl8192c/r92c.h | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sys/dev/rtwn/rtl8188e/r88e.h b/sys/dev/rtwn/rtl8188e/r88e.h
index b6cd6053d015..cbf1161f7078 100644
--- a/sys/dev/rtwn/rtl8188e/r88e.h
+++ b/sys/dev/rtwn/rtl8188e/r88e.h
@@ -21,6 +21,8 @@
#ifndef RTL8188E_H
#define RTL8188E_H
+#include <dev/rtwn/if_rtwn_ridx.h>
+
/*
* Global definitions.
*/
@@ -46,7 +48,7 @@ uint8_t r88e_temp_read(struct rtwn_softc *);
/* r88e_chan.c */
void r88e_get_txpower(struct rtwn_softc *, int,
- struct ieee80211_channel *, uint8_t[]);
+ struct ieee80211_channel *, uint8_t[RTWN_RIDX_COUNT]);
void r88e_set_bw20(struct rtwn_softc *, uint8_t);
void r88e_set_gain(struct rtwn_softc *, uint8_t);
diff --git a/sys/dev/rtwn/rtl8192c/r92c.h b/sys/dev/rtwn/rtl8192c/r92c.h
index 4d4307c786a4..925ce7a0adb4 100644
--- a/sys/dev/rtwn/rtl8192c/r92c.h
+++ b/sys/dev/rtwn/rtl8192c/r92c.h
@@ -21,6 +21,8 @@
#ifndef RTL8192C_H
#define RTL8192C_H
+#include <dev/rtwn/if_rtwn_ridx.h>
+
/*
* Global definitions.
*/
@@ -54,9 +56,9 @@ uint8_t r92c_temp_read(struct rtwn_softc *);
/* r92c_chan.c */
void r92c_get_txpower(struct rtwn_softc *, int,
- struct ieee80211_channel *, uint8_t[]);
+ struct ieee80211_channel *, uint8_t[RTWN_RIDX_COUNT]);
void r92c_write_txpower(struct rtwn_softc *, int,
- uint8_t power[]);
+ uint8_t power[RTWN_RIDX_COUNT]);
void r92c_set_bw20(struct rtwn_softc *, uint8_t);
void r92c_set_chan(struct rtwn_softc *, struct ieee80211_channel *);
void r92c_set_gain(struct rtwn_softc *, uint8_t);