Date: Tue, 29 Apr 2025 11:41:55 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: ae3d7f439568 - stable/14 - LinuxKPI: 802.11: remove lkpi_iv_key_set/delete wrappers Message-ID: <202504291141.53TBft7a046358@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3d7f439568d4fb0f27f22c585522ecc9430aca commit ae3d7f439568d4fb0f27f22c585522ecc9430aca Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2025-04-15 21:16:31 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504291141.53TBft7a046358>