wifi: mac80211: rename ieee80211_ie_build_he_6ghz_cap()

The term 'IE' isn't really in use in the spec, and I want
to rework all of this to use SKBs as the primary method
for building elements. Rename this one already.

Link: https://msgid.link/20240129202041.b8064a4e73b5.I8d2f4526562029107c6414c6cda378b300b1b0b0@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 43c55ea6349c681c0bc515c10fd8e9d10ae43a18..2b5d49399500d9457725c43d93a7e511b4e9ab3f 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -2506,9 +2506,6 @@ u8 ieee80211_ie_len_he_cap(struct ieee80211_sub_if_data *sdata);
 u8 *ieee80211_ie_build_he_cap(const struct ieee80211_conn_settings *conn,
                              const struct ieee80211_sta_he_cap *he_cap,
                              u8 *pos, u8 *end);
-void ieee80211_ie_build_he_6ghz_cap(struct ieee80211_sub_if_data *sdata,
-                                   enum ieee80211_smps_mode smps_mode,
-                                   struct sk_buff *skb);
 u8 *ieee80211_ie_build_he_oper(u8 *pos, struct cfg80211_chan_def *chandef);
 u8 *ieee80211_ie_build_eht_oper(u8 *pos, struct cfg80211_chan_def *chandef,
                                const struct ieee80211_sta_eht_cap *eht_cap);
@@ -2529,6 +2526,11 @@ void ieee80211_add_aid_request_ie(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb);
 u8 *ieee80211_ie_build_s1g_cap(u8 *pos, struct ieee80211_sta_s1g_cap *s1g_cap);
 
+/* element building in SKBs */
+void ieee80211_put_he_6ghz_cap(struct sk_buff *skb,
+                              struct ieee80211_sub_if_data *sdata,
+                              enum ieee80211_smps_mode smps_mode);
+
 /* channel management */
 bool ieee80211_chandef_ht_oper(const struct ieee80211_ht_operation *ht_oper,
                               struct cfg80211_chan_def *chandef);

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 000fa9484b4e30d470fd976105ee98d6e1541d57..10c7d7714ffed28cdd063fb2bcb5ded01f3fb1fb 100644 (file)
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -640,7 +640,7 @@ int mesh_add_he_6ghz_cap_ie(struct ieee80211_sub_if_data *sdata,
        if (!iftd)
                return 0;
 
-       ieee80211_ie_build_he_6ghz_cap(sdata, sdata->deflink.smps_mode, skb);
+       ieee80211_put_he_6ghz_cap(skb, sdata, sdata->deflink.smps_mode);
        return 0;
 }
 

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index bbc7894ccad0655004c7ae93a208d463ac300711..74a6c67a94da5a364224fc92a3f7d68f1b1b302a 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1067,7 +1067,7 @@ static void ieee80211_add_he_ie(struct ieee80211_sub_if_data *sdata,
        /* trim excess if any */
        skb_trim(skb, skb->len - (pre_he_pos + he_cap_size - pos));
 
-       ieee80211_ie_build_he_6ghz_cap(sdata, smps_mode, skb);
+       ieee80211_put_he_6ghz_cap(skb, sdata, smps_mode);
 }
 
 static void ieee80211_add_eht_ie(struct ieee80211_sub_if_data *sdata,

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index c2fe9aece00d1fbd2eadb7396742f2c82734e06e..e8de82bafeefbeb2814b10df5e7b044206cc5b3e 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -3413,9 +3413,9 @@ end:
        return pos;
 }
 
-void ieee80211_ie_build_he_6ghz_cap(struct ieee80211_sub_if_data *sdata,
-                                   enum ieee80211_smps_mode smps_mode,
-                                   struct sk_buff *skb)
+void ieee80211_put_he_6ghz_cap(struct sk_buff *skb,
+                              struct ieee80211_sub_if_data *sdata,
+                              enum ieee80211_smps_mode smps_mode)
 {
        struct ieee80211_supported_band *sband;
        const struct ieee80211_sband_iftype_data *iftd;