From nobody Thu Mar 13 01:07:45 2025 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 4ZCq9Z0Z66z5qmpv; Thu, 13 Mar 2025 01:07:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCq9Y28z1z4JN5; Thu, 13 Mar 2025 01:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741828065; 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=18W9cU7ZTGwhS+K+jAFkKPztB4KU3c2S0p64kmk30bY=; b=Uqhh1dOo95gLPXN1VCAUAAq5xHy2Afoo4MZxPVGG0wfjgBH4mogNUwdw3246wKE8SRwTWg lwz1xHyo3CyqvVLWF2X36HoTWqt3PmI4CvAl+d3mKYXd58vJx9Tvi45ShtRfcGYy60U0XG cQSD+4ZMC3zyJqBIZPiXZ8jDO1riakpZrgPBYtwNpV65YRNXuJftQ5JvKa+wwjaP+tPa6W KwX1rGl4Sbcw4Gqnqegy7roafbx9ZfVl07629UJK56YJGDk/5ShPE65zY36ZxqMSwGT2vY sTGKHe0bRwuL0HaROl/8hf64JqJR2nA27pEJ3XI+sGpj6x+QcCB4/OsZ8EzhJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741828065; a=rsa-sha256; cv=none; b=ZGPinn8mXWnEQMvNrT9VTHv0qtyTSNXA7/YUAxieJvocGXmJSBb3GXOx84xJh6rWhzW7bA 9qVEgKkeOtR2W6IxATqhJO4xAxuc4bfLDLTX8aQJlIcWxAIE08yCEHeVw8+N+Hgj88JaIz 1TLF5efqYX7blcOYY8XtjrMNPIfUL5MO0PHb5nzNd1qBvTxlb5CUwzE/PSEh9EbB4GCUCs V4ilbITx2N2Hl9ycIFIKKIYXck6PWKhZ95gLtPlIaCL0IcxV+E9dBpEMpcZ+WSD8g3sia2 iCPnDbfT1U4GbqEYvSP8QFcK7Pvm3lCZ2HHgy9Z5GhSeqJboD/MN/iZwz36Ipw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741828065; 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=18W9cU7ZTGwhS+K+jAFkKPztB4KU3c2S0p64kmk30bY=; b=AiUOhTJlJpkP9kOvxt4X8gQXfBzvp4hMkokXt8htcQ31mehLMffP477jWGovDHl6T2iUM0 AI326/EC8rG5ww8RVwbAJwGM18RiSRMalIRq3A/XB+/VhA1UDdt1C86zf4Ewut9ngzoQds upR80jr8Vse2ewoqMmHjcu6zwW+hPjrzgNSnZeVVtBoJqNVl4PvrX64boVRNxh4UK25Rc4 0stngAZM3bqFyfkZ0kTLI/ZgB9wqIxx/rXXwXa3vEsIOqE2rfiknLgbQBFgB2xmTl83NBA NOl8gslgIExju89Abf0U0bZrvOsfUM8fcQRQmren/Pc39gU9vQLUZD05S4qy8w== 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 4ZCq9Y1Sj8zbpc; Thu, 13 Mar 2025 01:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52D17j1I058397; Thu, 13 Mar 2025 01:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52D17j2n058394; Thu, 13 Mar 2025 01:07:45 GMT (envelope-from git) Date: Thu, 13 Mar 2025 01:07:45 GMT Message-Id: <202503130107.52D17j2n058394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: a54a240c1b57 - main - net80211: work around unused variable "vap" in non-debug builds 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a54a240c1b579e2c30af125f3b1fdfd87f280078 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=a54a240c1b579e2c30af125f3b1fdfd87f280078 commit a54a240c1b579e2c30af125f3b1fdfd87f280078 Author: Adrian Chadd AuthorDate: 2025-03-13 00:59:06 +0000 Commit: Adrian Chadd CommitDate: 2025-03-13 01:07:33 +0000 net80211: work around unused variable "vap" in non-debug builds Don't declare a variable that's only used during debug builds. --- sys/net80211/ieee80211_crypto_gcmp.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/net80211/ieee80211_crypto_gcmp.c b/sys/net80211/ieee80211_crypto_gcmp.c index a39404493fa2..290111235b4e 100644 --- a/sys/net80211/ieee80211_crypto_gcmp.c +++ b/sys/net80211/ieee80211_crypto_gcmp.c @@ -504,7 +504,6 @@ gcmp_encrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen) { struct gcmp_ctx *ctx = key->wk_private; struct ieee80211_frame *wh; - struct ieee80211vap *vap = ctx->cc_vap; struct mbuf *m = m0; int data_len, aad_len, iv_len, ret; uint8_t aad[GCM_AAD_LEN]; @@ -521,16 +520,18 @@ gcmp_encrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen) p_pktbuf = IEEE80211_MALLOC(data_len, M_TEMP, IEEE80211_M_NOWAIT | IEEE80211_M_ZERO); if (p_pktbuf == NULL) { - IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, - "%s", "AES-GCM encrypt failed; couldn't allocate buffer"); + IEEE80211_NOTE_MAC(ctx->cc_vap, IEEE80211_MSG_CRYPTO, + wh->i_addr2, "%s", + "AES-GCM encrypt failed; couldn't allocate buffer"); ctx->cc_vap->iv_stats.is_crypto_gcmp_nomem++; return (0); } c_pktbuf = IEEE80211_MALLOC(data_len, M_TEMP, IEEE80211_M_NOWAIT | IEEE80211_M_ZERO); if (c_pktbuf == NULL) { - IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, - "%s", "AES-GCM encrypt failed; couldn't allocate buffer"); + IEEE80211_NOTE_MAC(ctx->cc_vap, IEEE80211_MSG_CRYPTO, + wh->i_addr2, "%s", + "AES-GCM encrypt failed; couldn't allocate buffer"); ctx->cc_vap->iv_stats.is_crypto_gcmp_nomem++; IEEE80211_FREE(p_pktbuf, M_TEMP); return (0); @@ -562,8 +563,9 @@ gcmp_encrypt(struct ieee80211_key *key, struct mbuf *m0, int hdrlen) /* Append MIC */ ret = m_append(m0, gcmp_get_trailer_len(key), T); if (ret == 0) { - IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, - "%s", "AES-GCM encrypt failed; couldn't append T"); + IEEE80211_NOTE_MAC(ctx->cc_vap, IEEE80211_MSG_CRYPTO, + wh->i_addr2, "%s", + "AES-GCM encrypt failed; couldn't append T"); ctx->cc_vap->iv_stats.is_crypto_gcmp_nospc++; } @@ -592,7 +594,6 @@ gcmp_decrypt(struct ieee80211_key *key, u_int64_t pn, struct mbuf *m, { const struct ieee80211_rx_stats *rxs; struct gcmp_ctx *ctx = key->wk_private; - struct ieee80211vap *vap = ctx->cc_vap; struct ieee80211_frame *wh; int data_len, aad_len, iv_len, ret; uint8_t aad[GCM_AAD_LEN]; @@ -656,8 +657,8 @@ gcmp_decrypt(struct ieee80211_key *key, u_int64_t pn, struct mbuf *m, if (ret != 0) { /* Decrypt failure */ ctx->cc_vap->iv_stats.is_rx_gcmpmic++; - IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2, - "%s", "AES-GCM decrypt failed; MIC mismatch"); + IEEE80211_NOTE_MAC(ctx->cc_vap, IEEE80211_MSG_CRYPTO, + wh->i_addr2, "%s", "AES-GCM decrypt failed; MIC mismatch"); IEEE80211_FREE(p_pktbuf, M_TEMP); IEEE80211_FREE(c_pktbuf, M_TEMP); return (0);