cfg80211: remove struct ieee80211_he_bss_color

We don't really use this struct, we're now using
struct cfg80211_he_bss_color instead.

Change the one place in mac80211 that's using the old
name to use struct assignment instead of memcpy() and
thus remove the wrong sizeof while at it.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20201206145305.f6698d97ae4e.Iba2dffcb79c4ab80bde7407609806010b55edfdf@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index d9b67eed4f75973da818b13f785dd1c15bb407f5..1a79d6baa2547883182b2a4799ce433e18482539 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -302,19 +302,6 @@ struct cfg80211_he_bss_color {
        bool partial;
 };
 
-/**
- * struct ieee80211_he_bss_color - AP settings for BSS coloring
- *
- * @color: the current color.
- * @disabled: is the feature disabled.
- * @partial: define the AID equation.
- */
-struct ieee80211_he_bss_color {
-       u8 color;
-       bool disabled;
-       bool partial;
-};
-
 /**
  * struct ieee80211_sta_ht_cap - STA's HT capabilities
  *

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 7da343efd0900680132741d62dc00a6bcd8491a6..1344ce27353de7fc530c6c6f538b5f51941691f7 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1124,8 +1124,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
        sdata->vif.bss_conf.twt_responder = params->twt_responder;
        memcpy(&sdata->vif.bss_conf.he_obss_pd, &params->he_obss_pd,
               sizeof(struct ieee80211_he_obss_pd));
-       memcpy(&sdata->vif.bss_conf.he_bss_color, &params->he_bss_color,
-              sizeof(struct ieee80211_he_bss_color));
+       sdata->vif.bss_conf.he_bss_color = params->he_bss_color;
        sdata->vif.bss_conf.s1g = params->chandef.chan->band ==
                                  NL80211_BAND_S1GHZ;