From nobody Sat Feb 15 15:51:20 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 4YwD150mpNz5njnf; Sat, 15 Feb 2025 15:51:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YwD143HHfz3HP0; Sat, 15 Feb 2025 15:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739634680; 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=1+JRhyX/Bn7difiza5J9RBUmq2lT5oReq98UJ4k835U=; b=DmVWu+6d7kgGr+Q60GuIrKDywgYR+sZVVSOj07XHBzoNGFy+1wnJYCGeK2WaUUvTuiywp9 n2HVd85PVHKDxfyMJoUQHsEQhXDBz0TQ/0E3nOI2FXEvOywn+XaNc1L5kzvKiAG65JZl2D LiWxvd7qodrOZCWT0gLItYnoehMpoHHSdzQSxFnJsHica6PVPX7ZnJNQOEd69hADFWrQ8L hhe3ivUeVHgAD1Pf4kFXWNaLp2lQJFa5/1CI8nrdXQx1VIS6n9WOxp59WAc9i5wI/DoxHL 8uOGOxu4GBBRP5wGurKi0tHttc81gYUUIL5LF+eVp46tO6Ai8+Xz3G1GtUbcbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739634680; a=rsa-sha256; cv=none; b=t2TW4BAyXFzt/lTEHAnemeFMUhQhBzC7Sh5bJQkHU5dpc6fYwMqMoQx0Znt77Bt5Y4I7eZ 938Y722GHZZKMUdCJJz7W571fdVpJPwBCkW1B/tRZUEFRrh0YNQf/3DQAefqfzSCkJWe+M ZaVlM34IbWNDG90mxgG2Lml8GYRdmD8E8ymLcOJtHHEbF/n1kB+QwqCS2lww/dzUWhlPFa spOmys8CixTnskVCFXrj4Vvlz4otpxYALaiNaxbZ3ASnnRya7he2rDRKadKvUIrbDx+ibH O17H+yZ3ySAifYX/u53jQ0qmCS+qbGX0ExETdYGl53PbdV7SB/5d1CP/NXX9gA== 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=1739634680; 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=1+JRhyX/Bn7difiza5J9RBUmq2lT5oReq98UJ4k835U=; b=Ih49cEugNSS2+RXTryPqhiKhPXhVBB+gpJjtaJXXOhxD23XQxc44ix6hSFykrefjZfL/U2 /Wrk+Qq5z1iUrarzKjhkplzupsVw9+wDOVbwlK3TWROkmfnR63+JiOaDaZBPX7G66O2hDf zaibep/oMp8E+1C4alQeqcHZ7Y8wBO/nm9n3c6lA5no/MxtWIcj2sPNMADOGngFKNcjvTB ThgXB2b0jPWguIV/ik5KBBCv3fS9WOiiFPOgtkB4UQLVvWBaqQ516q+U7xzDkX0k3DT7xY 5FDOxJQkQi/rgYJ44w6ZpoAlHNGUzlbiLilmC+RNzoP+QHD5e6v6jNSKSh8MQg== 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 4YwD142f4nz1Mf9; Sat, 15 Feb 2025 15:51:20 +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 51FFpKEr050429; Sat, 15 Feb 2025 15:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51FFpK4F050426; Sat, 15 Feb 2025 15:51:20 GMT (envelope-from git) Date: Sat, 15 Feb 2025 15:51:20 GMT Message-Id: <202502151551.51FFpK4F050426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9763fec11b83 - main - net80211: use IEEE80211_KEY_UNDEFINED() insetad of checking they keyix 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9763fec11b83a7bfc2d2ba0681830d186a3f6a6e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9763fec11b83a7bfc2d2ba0681830d186a3f6a6e commit 9763fec11b83a7bfc2d2ba0681830d186a3f6a6e Author: Bjoern A. Zeeb AuthorDate: 2025-02-15 12:40:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-15 15:50:23 +0000 net80211: use IEEE80211_KEY_UNDEFINED() insetad of checking they keyix For ieee80211_node_delucastkey() rather than checking the keyix to be IEEE80211_KEYIX_NONE use the IEEE80211_KEY_UNDEFINED() macro (which chekes the wk_cipher to be 'none'). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48980 --- sys/net80211/ieee80211_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 17ddc8533e41..f2fc3d21a361 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2209,7 +2209,7 @@ ieee80211_node_delucastkey(struct ieee80211_node *ni) IEEE80211_NODE_LOCK(nt); nikey = NULL; status = 1; /* NB: success */ - if (ni->ni_ucastkey.wk_keyix != IEEE80211_KEYIX_NONE) { + if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { keyix = ni->ni_ucastkey.wk_rxkeyix; status = ieee80211_crypto_delkey(ni->ni_vap, &ni->ni_ucastkey); if (nt->nt_keyixmap != NULL && keyix < nt->nt_keyixmax) {