wifi: cfg80211: remove IEEE80211_CHAN_{1,2,4,8,16}MHZ flags

These were used by S1G for older chandef representation, but
are no longer needed. Clean them up, even if we can't drop
them from the userspace API entirely.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 1c041ce7a03b4ad8bcceec5e2723440fe0ce559f..781624f5913af9023de6626b09414bbccf58bab9 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -101,16 +101,6 @@ struct wiphy;
  * @IEEE80211_CHAN_NO_10MHZ: 10 MHz bandwidth is not permitted
  *     on this channel.
  * @IEEE80211_CHAN_NO_HE: HE operation is not permitted on this channel.
- * @IEEE80211_CHAN_1MHZ: 1 MHz bandwidth is permitted
- *     on this channel.
- * @IEEE80211_CHAN_2MHZ: 2 MHz bandwidth is permitted
- *     on this channel.
- * @IEEE80211_CHAN_4MHZ: 4 MHz bandwidth is permitted
- *     on this channel.
- * @IEEE80211_CHAN_8MHZ: 8 MHz bandwidth is permitted
- *     on this channel.
- * @IEEE80211_CHAN_16MHZ: 16 MHz bandwidth is permitted
- *     on this channel.
  * @IEEE80211_CHAN_NO_320MHZ: If the driver supports 320 MHz on the band,
  *     this flag indicates that a 320 MHz channel cannot use this
  *     channel as the control or any of the secondary channels.
@@ -152,11 +142,7 @@ enum ieee80211_channel_flags {
        IEEE80211_CHAN_NO_20MHZ                 = BIT(11),
        IEEE80211_CHAN_NO_10MHZ                 = BIT(12),
        IEEE80211_CHAN_NO_HE                    = BIT(13),
-       IEEE80211_CHAN_1MHZ                     = BIT(14),
-       IEEE80211_CHAN_2MHZ                     = BIT(15),
-       IEEE80211_CHAN_4MHZ                     = BIT(16),
-       IEEE80211_CHAN_8MHZ                     = BIT(17),
-       IEEE80211_CHAN_16MHZ                    = BIT(18),
+       /* can use free bits here */
        IEEE80211_CHAN_NO_320MHZ                = BIT(19),
        IEEE80211_CHAN_NO_EHT                   = BIT(20),
        IEEE80211_CHAN_DFS_CONCURRENT           = BIT(21),

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index de34a1d14073373fe8c8838581a578874c2bb8bc..346dfd2bd9879c44d35f518a8bdedba78018ab87 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1280,21 +1280,6 @@ static int nl80211_msg_put_channel(struct sk_buff *msg, struct wiphy *wiphy,
                if ((chan->flags & IEEE80211_CHAN_NO_HE) &&
                    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HE))
                        goto nla_put_failure;
-               if ((chan->flags & IEEE80211_CHAN_1MHZ) &&
-                   nla_put_flag(msg, NL80211_FREQUENCY_ATTR_1MHZ))
-                       goto nla_put_failure;
-               if ((chan->flags & IEEE80211_CHAN_2MHZ) &&
-                   nla_put_flag(msg, NL80211_FREQUENCY_ATTR_2MHZ))
-                       goto nla_put_failure;
-               if ((chan->flags & IEEE80211_CHAN_4MHZ) &&
-                   nla_put_flag(msg, NL80211_FREQUENCY_ATTR_4MHZ))
-                       goto nla_put_failure;
-               if ((chan->flags & IEEE80211_CHAN_8MHZ) &&
-                   nla_put_flag(msg, NL80211_FREQUENCY_ATTR_8MHZ))
-                       goto nla_put_failure;
-               if ((chan->flags & IEEE80211_CHAN_16MHZ) &&
-                   nla_put_flag(msg, NL80211_FREQUENCY_ATTR_16MHZ))
-                       goto nla_put_failure;
                if ((chan->flags & IEEE80211_CHAN_NO_320MHZ) &&
                    nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_320MHZ))
                        goto nla_put_failure;