wifi: mac80211: expose ieee80211_chan_width_to_rx_bw() to drivers

Drivers might need to also do this calculation, no point in
them duplicating the code. Since it's so simple, just make
it an inline.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241007144851.af003cb4a088.I8b5d29504b726caae24af6013c65b3daebe842a2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 7a6edc04e2124d84c420c70311c6bbceac9e7d7d..32bdda90a4ac9dc760e3508170a8b1f079f1a172 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -7704,6 +7704,33 @@ void ieee80211_set_active_links_async(struct ieee80211_vif *vif,
  */
 void ieee80211_send_teardown_neg_ttlm(struct ieee80211_vif *vif);
 
+/**
+ * ieee80211_chan_width_to_rx_bw - convert channel width to STA RX bandwidth
+ * @width: the channel width value to convert
+ * Return: the STA RX bandwidth value for the channel width
+ */
+static inline enum ieee80211_sta_rx_bandwidth
+ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)
+{
+       switch (width) {
+       default:
+               WARN_ON_ONCE(1);
+               fallthrough;
+       case NL80211_CHAN_WIDTH_20_NOHT:
+       case NL80211_CHAN_WIDTH_20:
+               return IEEE80211_STA_RX_BW_20;
+       case NL80211_CHAN_WIDTH_40:
+               return IEEE80211_STA_RX_BW_40;
+       case NL80211_CHAN_WIDTH_80:
+               return IEEE80211_STA_RX_BW_80;
+       case NL80211_CHAN_WIDTH_160:
+       case NL80211_CHAN_WIDTH_80P80:
+               return IEEE80211_STA_RX_BW_160;
+       case NL80211_CHAN_WIDTH_320:
+               return IEEE80211_STA_RX_BW_320;
+       }
+}
+
 /* for older drivers - let's not document these ... */
 int ieee80211_emulate_add_chanctx(struct ieee80211_hw *hw,
                                  struct ieee80211_chanctx_conf *ctx);

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 45987add530f1662467aae6fbc87094cd11bb28e..d20c2e796703e5cfc9e20a36ba9b882c862b7b10 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -2194,8 +2194,6 @@ ieee80211_sta_cur_vht_bw(struct link_sta_info *link_sta)
        return _ieee80211_sta_cur_vht_bw(link_sta, NULL);
 }
 void ieee80211_sta_init_nss(struct link_sta_info *link_sta);
-enum ieee80211_sta_rx_bandwidth
-ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width);
 enum nl80211_chan_width
 ieee80211_sta_cap_chan_bw(struct link_sta_info *link_sta);
 void ieee80211_process_mu_groups(struct ieee80211_sub_if_data *sdata,

diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c
index 0d439cefb445a25ec3c28e8868cd1e078c733073..6a20fa09919082462f735982f9b3a3ea1ad651ca 100644 (file)
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -479,28 +479,6 @@ ieee80211_sta_rx_bw_to_chan_width(struct link_sta_info *link_sta)
        }
 }
 
-enum ieee80211_sta_rx_bandwidth
-ieee80211_chan_width_to_rx_bw(enum nl80211_chan_width width)
-{
-       switch (width) {
-       case NL80211_CHAN_WIDTH_20_NOHT:
-       case NL80211_CHAN_WIDTH_20:
-               return IEEE80211_STA_RX_BW_20;
-       case NL80211_CHAN_WIDTH_40:
-               return IEEE80211_STA_RX_BW_40;
-       case NL80211_CHAN_WIDTH_80:
-               return IEEE80211_STA_RX_BW_80;
-       case NL80211_CHAN_WIDTH_160:
-       case NL80211_CHAN_WIDTH_80P80:
-               return IEEE80211_STA_RX_BW_160;
-       case NL80211_CHAN_WIDTH_320:
-               return IEEE80211_STA_RX_BW_320;
-       default:
-               WARN_ON_ONCE(1);
-               return IEEE80211_STA_RX_BW_20;
-       }
-}
-
 /* FIXME: rename/move - this deals with everything not just VHT */
 enum ieee80211_sta_rx_bandwidth
 _ieee80211_sta_cur_vht_bw(struct link_sta_info *link_sta,