tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Johannes Berg e0d3bba8 32d340ae

+1 -30
+1 -15
include/net/cfg80211.h
··· 101 101 * @IEEE80211_CHAN_NO_10MHZ: 10 MHz bandwidth is not permitted 102 102 * on this channel. 103 103 * @IEEE80211_CHAN_NO_HE: HE operation is not permitted on this channel. 104 - * @IEEE80211_CHAN_1MHZ: 1 MHz bandwidth is permitted 105 - * on this channel. 106 - * @IEEE80211_CHAN_2MHZ: 2 MHz bandwidth is permitted 107 - * on this channel. 108 - * @IEEE80211_CHAN_4MHZ: 4 MHz bandwidth is permitted 109 - * on this channel. 110 - * @IEEE80211_CHAN_8MHZ: 8 MHz bandwidth is permitted 111 - * on this channel. 112 - * @IEEE80211_CHAN_16MHZ: 16 MHz bandwidth is permitted 113 - * on this channel. 114 104 * @IEEE80211_CHAN_NO_320MHZ: If the driver supports 320 MHz on the band, 115 105 * this flag indicates that a 320 MHz channel cannot use this 116 106 * channel as the control or any of the secondary channels. ··· 142 152 IEEE80211_CHAN_NO_20MHZ = BIT(11), 143 153 IEEE80211_CHAN_NO_10MHZ = BIT(12), 144 154 IEEE80211_CHAN_NO_HE = BIT(13), 145 - IEEE80211_CHAN_1MHZ = BIT(14), 146 - IEEE80211_CHAN_2MHZ = BIT(15), 147 - IEEE80211_CHAN_4MHZ = BIT(16), 148 - IEEE80211_CHAN_8MHZ = BIT(17), 149 - IEEE80211_CHAN_16MHZ = BIT(18), 155 + /* can use free bits here */ 150 156 IEEE80211_CHAN_NO_320MHZ = BIT(19), 151 157 IEEE80211_CHAN_NO_EHT = BIT(20), 152 158 IEEE80211_CHAN_DFS_CONCURRENT = BIT(21),
-15
net/wireless/nl80211.c
··· 1280 1280 if ((chan->flags & IEEE80211_CHAN_NO_HE) && 1281 1281 nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_HE)) 1282 1282 goto nla_put_failure; 1283 - if ((chan->flags & IEEE80211_CHAN_1MHZ) && 1284 - nla_put_flag(msg, NL80211_FREQUENCY_ATTR_1MHZ)) 1285 - goto nla_put_failure; 1286 - if ((chan->flags & IEEE80211_CHAN_2MHZ) && 1287 - nla_put_flag(msg, NL80211_FREQUENCY_ATTR_2MHZ)) 1288 - goto nla_put_failure; 1289 - if ((chan->flags & IEEE80211_CHAN_4MHZ) && 1290 - nla_put_flag(msg, NL80211_FREQUENCY_ATTR_4MHZ)) 1291 - goto nla_put_failure; 1292 - if ((chan->flags & IEEE80211_CHAN_8MHZ) && 1293 - nla_put_flag(msg, NL80211_FREQUENCY_ATTR_8MHZ)) 1294 - goto nla_put_failure; 1295 - if ((chan->flags & IEEE80211_CHAN_16MHZ) && 1296 - nla_put_flag(msg, NL80211_FREQUENCY_ATTR_16MHZ)) 1297 - goto nla_put_failure; 1298 1283 if ((chan->flags & IEEE80211_CHAN_NO_320MHZ) && 1299 1284 nla_put_flag(msg, NL80211_FREQUENCY_ATTR_NO_320MHZ)) 1300 1285 goto nla_put_failure;