Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

wiphy: add 6Ghz support

This commit is contained in:
James Prestwood 2022-02-25 09:58:05 -08:00 committed by Denis Kenzior
parent 5b6f1e3662
commit 7882621ca9
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wiphy.c
View File

@ -106,6 +106,7 @@ struct wiphy {
struct scan_freq_set *supported_freqs; struct scan_freq_set *supported_freqs;
struct band *band_2g; struct band *band_2g;
struct band *band_5g; struct band *band_5g;
struct band *band_6g;
char *model_str; char *model_str;
char *vendor_str; char *vendor_str;
char *driver_str; char *driver_str;
@ -350,6 +351,11 @@ static void wiphy_free(void *data)
wiphy->band_5g = NULL; wiphy->band_5g = NULL;
} }
if (wiphy->band_6g) {
band_free(wiphy->band_6g);
wiphy->band_6g = NULL;
}
scan_freq_set_free(wiphy->supported_freqs); scan_freq_set_free(wiphy->supported_freqs);
watchlist_destroy(&wiphy->state_watches); watchlist_destroy(&wiphy->state_watches);
l_free(wiphy->model_str); l_free(wiphy->model_str);
@ -436,6 +442,9 @@ uint32_t wiphy_get_supported_bands(struct wiphy *wiphy)
if (wiphy->band_5g) if (wiphy->band_5g)
bands |= BAND_FREQ_5_GHZ; bands |= BAND_FREQ_5_GHZ;
if (wiphy->band_6g)
bands |= BAND_FREQ_6_GHZ;
return bands; return bands;
} }
@ -739,6 +748,9 @@ const uint8_t *wiphy_get_supported_rates(struct wiphy *wiphy, unsigned int band,
case NL80211_BAND_5GHZ: case NL80211_BAND_5GHZ:
bandp = wiphy->band_5g; bandp = wiphy->band_5g;
break; break;
case NL80211_BAND_6GHZ:
bandp = wiphy->band_6g;
break;
default: default:
return NULL; return NULL;
} }
@ -789,6 +801,9 @@ int wiphy_estimate_data_rate(struct wiphy *wiphy,
case BAND_FREQ_5_GHZ: case BAND_FREQ_5_GHZ:
bandp = wiphy->band_5g; bandp = wiphy->band_5g;
break; break;
case BAND_FREQ_6_GHZ:
bandp = wiphy->band_6g;
break;
default: default:
return -ENOTSUP; return -ENOTSUP;
} }
@ -979,6 +994,9 @@ static void wiphy_print_basic_info(struct wiphy *wiphy)
if (wiphy->band_5g) if (wiphy->band_5g)
wiphy_print_band_info(wiphy->band_5g, "5Ghz Band"); wiphy_print_band_info(wiphy->band_5g, "5Ghz Band");
if (wiphy->band_6g)
wiphy_print_band_info(wiphy->band_6g, "6GHz Band");
if (wiphy->supported_ciphers) { if (wiphy->supported_ciphers) {
int len = 0; int len = 0;
@ -1193,6 +1211,9 @@ static void parse_supported_bands(struct wiphy *wiphy,
case NL80211_BAND_5GHZ: case NL80211_BAND_5GHZ:
bandp = &wiphy->band_5g; bandp = &wiphy->band_5g;
break; break;
case NL80211_BAND_6GHZ:
bandp = &wiphy->band_6g;
break;
default: default:
continue; continue;
} }