From nobody Mon Feb 24 20:27:07 2025 X-Original-To: dev-commits-src-branches@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 4Z1sj80xspz5ppr7; Mon, 24 Feb 2025 20:27:08 +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 4Z1sj74CSsz3p1X; Mon, 24 Feb 2025 20:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740428827; 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=1V8KYL0heYPpIQQ+2wNL4IpckPWOj/h7FuP4IH+gbQA=; b=M+TT5SMsJSVcUXzzqmhbNJ+Zi521aLLOMxPk9gvN+u9UqmYMXTzWUGkPG039b3pBJ3wSBd woOHbW0IAk27ixNu4ZXaTzD1BHomOyMPshbhG/bmEefTn8REfLRWius4bx1kfNCZwQezfa Q8wnpPV6NHiC1Ff3srs8uz4YXXaW4CggQN8bRosrlmr4vubqg54U13r/xkcCeMnXE7QLj7 vAXSmsdlYYf9HuML6Kx+UQXsbrtO3p8RK7o216dwh1EXKz/PQ1m2KSGoxEBYvxh40kKeqv 5shRR9j7Rl4WhQfoO4Qe+8C0kkZhqvI/u4EYRo6skwIRf54UIXHy8kKwEJG/vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740428827; a=rsa-sha256; cv=none; b=KxfJSv/MoShEW7dMSHEGvYpa4t9qexVhtSaBVpvd2j1PoJ/TzgL066nXXpgA/PmnWTqi6t rV13lwpsJE4PjGJ1xWBMFsapRlwPtLd0bu7d7foRjW5jVvKJ7P+O6of3VA3eUAjUhvzGAi yytFbR1S0Cbuj+mxbx6fb8uNN3otK2VVD66zSdZaUrA2nIUGSteGIlHb5YyZHGdKcX5Ffm o/q7pkrgaAv2pAbf2VjBbFjxTofg0m90oGXTSQgr2cQ0dbAE9kzqNQnLApntWixzWAtPZ6 ZH67ntnYJlru06B7776ICMxJK+ZNin5rRd/dcdYvUp/77m01kV4snr2oCBEENg== 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=1740428827; 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=1V8KYL0heYPpIQQ+2wNL4IpckPWOj/h7FuP4IH+gbQA=; b=EtXb3HZ9zuCk9lGvxa1WMlcvqeFdNXLtjmorvit513q4xXbfSPIbbxGxyfewrRWzCWC7lW s86eXnXzrOM5zVtyRbSbWh+v7TPHHrPbmlK+FA9v3B2jVRwTPveIEZFcO7gsQCB4teO26u AfUcHVNw9zUKNPDS4Brm5BBgAz3Y6jszBFs+1tSvxaTyA4xaLHDGVT1w6jEsE3942nThzs 6+zbF1b2KGpOK8lRlW3WMFTEvrj2PY9APsR+zHj/X0tHhivTqj7uR1vTfmZkXH2rl+++ck GKSMcwtz48xtCuOZBzf3dqBMjvgvkBmEdFqv9RfgiixkKMD41khcYro0MQDzGg== 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 4Z1sj73bB1zw3X; Mon, 24 Feb 2025 20:27:07 +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 51OKR7K6027165; Mon, 24 Feb 2025 20:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OKR7pI027162; Mon, 24 Feb 2025 20:27:07 GMT (envelope-from git) Date: Mon, 24 Feb 2025 20:27:07 GMT Message-Id: <202502242027.51OKR7pI027162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 6ddcff36f154 - stable/14 - net80211: use IEEE80211_KEY_UNDEFINED() insetad of checking they keyix List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6ddcff36f1545b8868094eff686132e293553d52 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6ddcff36f1545b8868094eff686132e293553d52 commit 6ddcff36f1545b8868094eff686132e293553d52 Author: Bjoern A. Zeeb AuthorDate: 2025-02-15 12:40:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-24 20:26:47 +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 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D48980 (cherry picked from commit 9763fec11b83a7bfc2d2ba0681830d186a3f6a6e) --- 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) {