From nobody Wed Apr 23 16:25:21 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 4ZjPbQ57qXz5tbgh; Wed, 23 Apr 2025 16:25:22 +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 4ZjPbP6gsPz49V6; Wed, 23 Apr 2025 16:25:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745425521; 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=dGRVubKMnFy4Tl7NXGzeHWnVggm9csOlFqteYmYSjvc=; b=kw/0lSSzA5lF+gk3nZoafOnUsP6DHiLFNK9G2EnKuZoj3uBFeQTvSyBfP6TpZ8UT4vd5U8 FtpAhOhNfr56OOH8UIlmEQ3T4AsYGzH9jYMfuHAEy7flxZkkNGjuiN/jojg3Ee9mK3IRXK UNq0r/+9I3/LGtbx6s8qv0OwJKE/iWCkdAOkMeJLHKc116rrGCdqTFNrGEgXEMi90P2z2l bS5wIQ7IWNSqrgVMd8pIdpQG/6c2oZqvLC8Q66cWn2grmGzwu1iM3jpGrHNpT4oWS+H8uD dVnphNh8cdoKB7morS3rGh1G1+1ukqgkINB8oMoqW7wtn8EkIXX2ebFbRhxfTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745425521; a=rsa-sha256; cv=none; b=ZLAI6Q7cmtMhisk2zjvwARV8qIv05FK5rsOTAGFWYdCraFlbfqtE3gLJ4AfgAvl1/I64KW XaV0bjr3AoeQocuaMUrt9X20pRzhMNMRypXAoDy/NL36ZJ9MpE1zeEK00SdPl48VgN9wt7 gfonX+y7WJTbPAuSTt+YW6wn4yuPLNtxDoiMv6MbqpB7wmTDRtBM2YCNK3TDIHmh7V3raV p0QSi3DaoSCP5i/C0jPfEpMmZ8xuEQ/nw2E47xNnO+YjbYBOk/KLBSeLETZio6bLTp82Ul XThTiijBTT4mJAMQLXQpvbVm9yt4he4WBbWGQ+kPs6gyo4Y7tjMCVjrmq6/R9g== 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=1745425521; 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=dGRVubKMnFy4Tl7NXGzeHWnVggm9csOlFqteYmYSjvc=; b=GmUhlSXWQltqCpAgxQdO3w3cMyrk3nyLermnFPMhZVigT+kK+y8CNUza0e56mdFXLlFbML omDKhF1p5TPyNSdvbEHBRqG1MT2M/AaxdjGtq0JvvKP7g6LwDaqJm3XvErG/2KxZ0mfvwn AwtuLlbK39cCMgv6lakvMYh8Ret5BK8aeE0kNzguvEMD1oRibXS2+24uGIHHPbVQVLp3lY pDPhQjJHluYjwwGGHaxVI9zukPZB+WyW63JF0PRIi/M30X3AmTrtknUEqhFa/BgJ5EK1Nd nFDuMryL2+8zdfEfXmNZ2VgcDbSKc9uNbENyKBrIs2fa69WY4+7e8PcyepfAZA== 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 4ZjPbP31FHz19vV; Wed, 23 Apr 2025 16:25:21 +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 53NGPLcS081951; Wed, 23 Apr 2025 16:25:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NGPLrr081948; Wed, 23 Apr 2025 16:25:21 GMT (envelope-from git) Date: Wed, 23 Apr 2025 16:25:21 GMT Message-Id: <202504231625.53NGPLrr081948@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: aa294e8e40a1 - main - LinuxKPI: 802.11: remove lkpi_iv_key_set/delete wrappers 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: aa294e8e40a1aa93d5af05d573744833c5f6804a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=aa294e8e40a1aa93d5af05d573744833c5f6804a commit aa294e8e40a1aa93d5af05d573744833c5f6804a Author: Bjoern A. Zeeb AuthorDate: 2025-04-15 21:16:31 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-23 16:24:20 +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 MFC after: 3 days --- 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 3ece7c06971c..88c3445423c5 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1241,8 +1241,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; @@ -1338,16 +1340,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; @@ -1471,13 +1464,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) {