git: aa294e8e40a1 - main - LinuxKPI: 802.11: remove lkpi_iv_key_set/delete wrappers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 23 Apr 2025 16:25:21 UTC
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=aa294e8e40a1aa93d5af05d573744833c5f6804a
commit aa294e8e40a1aa93d5af05d573744833c5f6804a
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-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)
{