cfg80211: remove enum ieee80211_band
This enum is already perfectly aliased to enum nl80211_band, and the only reason for it is that we get IEEE80211_NUM_BANDS out of it. There's no really good reason to not declare the number of bands in nl80211 though, so do that and remove the cfg80211 one. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
@@ -169,21 +169,21 @@ static ssize_t ieee80211_if_write_##name(struct file *file, \
|
||||
IEEE80211_IF_FILE_R(name)
|
||||
|
||||
/* common attributes */
|
||||
IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ],
|
||||
IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[NL80211_BAND_2GHZ],
|
||||
HEX);
|
||||
IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],
|
||||
IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[NL80211_BAND_5GHZ],
|
||||
HEX);
|
||||
IEEE80211_IF_FILE(rc_rateidx_mcs_mask_2ghz,
|
||||
rc_rateidx_mcs_mask[IEEE80211_BAND_2GHZ], HEXARRAY);
|
||||
rc_rateidx_mcs_mask[NL80211_BAND_2GHZ], HEXARRAY);
|
||||
IEEE80211_IF_FILE(rc_rateidx_mcs_mask_5ghz,
|
||||
rc_rateidx_mcs_mask[IEEE80211_BAND_5GHZ], HEXARRAY);
|
||||
rc_rateidx_mcs_mask[NL80211_BAND_5GHZ], HEXARRAY);
|
||||
|
||||
static ssize_t ieee80211_if_fmt_rc_rateidx_vht_mcs_mask_2ghz(
|
||||
const struct ieee80211_sub_if_data *sdata,
|
||||
char *buf, int buflen)
|
||||
{
|
||||
int i, len = 0;
|
||||
const u16 *mask = sdata->rc_rateidx_vht_mcs_mask[IEEE80211_BAND_2GHZ];
|
||||
const u16 *mask = sdata->rc_rateidx_vht_mcs_mask[NL80211_BAND_2GHZ];
|
||||
|
||||
for (i = 0; i < NL80211_VHT_NSS_MAX; i++)
|
||||
len += scnprintf(buf + len, buflen - len, "%04x ", mask[i]);
|
||||
@@ -199,7 +199,7 @@ static ssize_t ieee80211_if_fmt_rc_rateidx_vht_mcs_mask_5ghz(
|
||||
char *buf, int buflen)
|
||||
{
|
||||
int i, len = 0;
|
||||
const u16 *mask = sdata->rc_rateidx_vht_mcs_mask[IEEE80211_BAND_5GHZ];
|
||||
const u16 *mask = sdata->rc_rateidx_vht_mcs_mask[NL80211_BAND_5GHZ];
|
||||
|
||||
for (i = 0; i < NL80211_VHT_NSS_MAX; i++)
|
||||
len += scnprintf(buf + len, buflen - len, "%04x ", mask[i]);
|
||||
|
Reference in New Issue
Block a user