From nobody Tue Apr 29 11:41:55 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 4Zmz1b5b7Lz5tv9C; Tue, 29 Apr 2025 11:41:55 +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 4Zmz1b1mx8z3xC0; Tue, 29 Apr 2025 11:41:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745926915; 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=iufX4WA3Xi3xey4Sfx4x6Ml7zV6np+WvJUkUK+2ZpPU=; b=clwlZLYN0GYx9YLmWqRBLLlGBg2AoOuSeCNwwdZs3EEkFV/NE3MO10Te7IEXI6byzaAV87 k25ECxTW/NTdKHWw1t3eDzfkHea2RtBMND92YoK2X/izfo6oHLrhIx9iqjx/Y1c/bUY65m pJrq8YmVXsAGXPlv8yjaUEsW2/Oix2w6FRtM1n/CiwlJnAIpXVrQvcG33/r/pSmgO26yNU jH8V1g110pRjUuXPeBuAxnsqlQLdsw4SmVFoiXHg+ED8JTqAEwv64iBqAY1eqbwHPxLVPF al9Oc/US/2+wnV7blVGfFU1rKL1TWfwVi0aBMoKPJVEUHUlZI7lAAXYXfVOYtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745926915; a=rsa-sha256; cv=none; b=eh4dZohk8WkYpKpZv7HeYr32RbSrGz4+EiQVE+FFQ+r8aCbeRZpqGn+xdxr+ba619qTFUh 4YAPC4IQMI8EiAVGy2taa9VQ9sDRgm6oTxcmiXj2UL5w/8rU+TeONT9xuBFGFu18v3lGlu myBWigNEQH/KDFmNO5uBui87zoYJh0rxPYMMnWvKxTnRFikaM7kpi4y8iG3nzyAOZ7p4Vc EeTXYvvCD3O1575fmMMqc6yGD6AFLkM2khFE5RAaPldjhnHkaRbBid6kpO3/lguXwoFp7H axLVG3FyR71pfduKJt9R6zePEEg5L42HqmFe7koxWOHG+6HZmzHYV0hdHnB+Ig== 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=1745926915; 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=iufX4WA3Xi3xey4Sfx4x6Ml7zV6np+WvJUkUK+2ZpPU=; b=Fq0ncyJLVPBXRZwPuCg/lrrMUs/zZOm1MfDPzTWt9o4tBI+wzA26zFFqxhq3y6Z5mspQaP Yoi5Et8nruRGP9guNxjLIqtNjoGWJKUwQivJVkkW3AT0pXIzb3ZZLzsqSHrbS6MuFHG8dA wRF8leV21MabcbbfEK1Wyh7mpoBjuFEcWGZsTq7pzp9h90t7BZnJgLZmvGQ08ZLoCggr8s ztKmZrvf+oA/8Z/gIXl2SrC11mK48zPL+XRZuUcO0lZB5ZHxISJg21jgNRjoevMmLt/ONj yM3bJFm8NUK0JqJDMXohw6DeRp0MPPFausAryiWl4Z7dddkZVNKyqeRtrNkkuQ== 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 4Zmz1b1Npqz44w; Tue, 29 Apr 2025 11:41:55 +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 53TBftVw046361; Tue, 29 Apr 2025 11:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TBft7a046358; Tue, 29 Apr 2025 11:41:55 GMT (envelope-from git) Date: Tue, 29 Apr 2025 11:41:55 GMT Message-Id: <202504291141.53TBft7a046358@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: ae3d7f439568 - stable/14 - LinuxKPI: 802.11: remove lkpi_iv_key_set/delete wrappers 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: ae3d7f439568d4fb0f27f22c585522ecc9430aca Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3d7f439568d4fb0f27f22c585522ecc9430aca commit ae3d7f439568d4fb0f27f22c585522ecc9430aca Author: Bjoern A. Zeeb AuthorDate: 2025-04-15 21:16:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-29 10:49:31 +0000 LinuxKPI: 802.11: remove lkpi_iv_key_set/delete wrappers We currently use simple wrapper functions not doing anything for lkpi_iv_key_set/delete. Garbage collect them and call the implementation directly. Sponsored by: The FreeBSD Foundation (cherry picked from commit aa294e8e40a1aa93d5af05d573744833c5f6804a) --- sys/compat/linuxkpi/common/src/linux_80211.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 2dc7b7c8ec9a..69f065df6b4f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1222,8 +1222,10 @@ lkpi_sta_del_keys(struct ieee80211_hw *hw, struct ieee80211_vif *vif, return (error); } +/* XXX-BZ one day we should replace this iterating over VIFs, or node list? */ +/* See also lkpi_sta_del_keys() these days. */ static int -_lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) +lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) { struct ieee80211com *ic; struct lkpi_hw *lhw; @@ -1319,16 +1321,7 @@ out: } static int -lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) -{ - - /* XXX-BZ one day we should replace this iterating over VIFs, or node list? */ - /* See also lkpi_sta_del_keys() these days. */ - return (_lkpi_iv_key_delete(vap, k)); -} - -static int -_lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) +lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) { struct ieee80211com *ic; struct lkpi_hw *lhw; @@ -1452,13 +1445,6 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) return (1); } -static int -lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) -{ - - return (_lkpi_iv_key_set(vap, k)); -} - static void lkpi_iv_key_update_begin(struct ieee80211vap *vap) {