diff mbox series

[04/10] wiphy: add getter for HT capabilities

Message ID 20221220214318.2041986-4-prestwoj@gmail.com (mailing list archive)
State New
Headers show
Series [01/10] ap: make supported rates a common builder. | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
prestwoj/iwd-ci-gitlint success GitLint

Commit Message

James Prestwood Dec. 20, 2022, 9:43 p.m. UTC 
This adds some additional parsing to obtain the AMPDU parameter
byte as well as wiphy_get_ht_capabilities() which returns the
complete IE (combining the 3 separate kernel attributes).
---
 src/wiphy.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/wiphy.h |  3 +++
 2 files changed, 56 insertions(+)

Comments

Denis Kenzior Dec. 27, 2022, 5:22 p.m. UTC | #1 
Hi James,

On 12/20/22 15:43, James Prestwood wrote:
> This adds some additional parsing to obtain the AMPDU parameter
> byte as well as wiphy_get_ht_capabilities() which returns the
> complete IE (combining the 3 separate kernel attributes).
> ---
>   src/wiphy.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>   src/wiphy.h |  3 +++
>   2 files changed, 56 insertions(+)
> 

<snip>

> @@ -1617,6 +1653,23 @@ static void parse_supported_bands(struct wiphy *wiphy,
>   				memcpy(band->ht_capabilities, data, len);
>   				band->ht_supported = true;
>   				break;
> +			/*
> +			 * AMPDU factor/density are part of A-MPDU Parameters,
> +			 * 802.11-2020 Section 9.4.2.55.3.
> +			 */
> +			case NL80211_BAND_ATTR_HT_AMPDU_FACTOR:
> +				if (L_WARN_ON(len != 1))
> +					continue;
> +
> +				band->ht_ampdu_params |= l_get_u8(data) & 0x3;
> +				break;
> +			case NL80211_BAND_ATTR_HT_AMPDU_DENSITY:
> +				if (L_WARN_ON(len != 1))
> +					continue;
> +
> +				band->ht_ampdu_params |=
> +						(l_get_u8(data) & 0x7) >> 2;

So I think you meant to shift left here, i.e. ' << 2'.  I made amended this 
patch to reflect that.  Let me know if I'm incorrect about this.

> +				break;
>   			case NL80211_BAND_ATTR_IFTYPE_DATA:
>   				if (!l_genl_attr_recurse(&attr, &nested))
>   					continue;

Applied, thanks.

Regards,
-Denis
diff mbox series

Patch

diff --git a/src/wiphy.c b/src/wiphy.c
index 4ea7c3f8..ab8aa6c0 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -910,6 +910,42 @@  bool wiphy_country_is_unknown(struct wiphy *wiphy)
 			(cc[0] == 'X' && cc[1] == 'X'));
 }
 
+const uint8_t *wiphy_get_ht_capabilities(const struct wiphy *wiphy,
+						enum band_freq band,
+						size_t *size)
+{
+	static uint8_t ht_capa[26];
+	const struct band *bandp = wiphy_get_band(wiphy, band);
+
+	if (!bandp)
+		return NULL;
+
+	if (!bandp->ht_supported)
+		return NULL;
+
+	memset(ht_capa, 0, sizeof(ht_capa));
+
+	/*
+	 * The kernel segments the HT capabilities element into multiple
+	 * attributes. For convenience on the caller just combine them and
+	 * return the full IE rather than adding 3 separate getters. This also
+	 * provides a way to check if HT is supported.
+	 */
+	memcpy(ht_capa, bandp->ht_capabilities, 2);
+	ht_capa[2] = bandp->ht_ampdu_params;
+	memcpy(ht_capa + 3, bandp->ht_mcs_set, 16);
+
+	/*
+	 * TODO: HT Extended capabilities, beamforming, and ASEL capabilities
+	 * are not available to get from the kernel, leave as zero.
+	 */
+
+	if (size)
+		*size = sizeof(ht_capa);
+
+	return ht_capa;
+}
+
 int wiphy_estimate_data_rate(struct wiphy *wiphy,
 				const void *ies, uint16_t ies_len,
 				const struct scan_bss *bss,
@@ -1617,6 +1653,23 @@  static void parse_supported_bands(struct wiphy *wiphy,
 				memcpy(band->ht_capabilities, data, len);
 				band->ht_supported = true;
 				break;
+			/*
+			 * AMPDU factor/density are part of A-MPDU Parameters,
+			 * 802.11-2020 Section 9.4.2.55.3.
+			 */
+			case NL80211_BAND_ATTR_HT_AMPDU_FACTOR:
+				if (L_WARN_ON(len != 1))
+					continue;
+
+				band->ht_ampdu_params |= l_get_u8(data) & 0x3;
+				break;
+			case NL80211_BAND_ATTR_HT_AMPDU_DENSITY:
+				if (L_WARN_ON(len != 1))
+					continue;
+
+				band->ht_ampdu_params |=
+						(l_get_u8(data) & 0x7) >> 2;
+				break;
 			case NL80211_BAND_ATTR_IFTYPE_DATA:
 				if (!l_genl_attr_recurse(&attr, &nested))
 					continue;
diff --git a/src/wiphy.h b/src/wiphy.h
index 6616da61..5cf22537 100644
--- a/src/wiphy.h
+++ b/src/wiphy.h
@@ -138,6 +138,9 @@  bool wiphy_get_rsnxe(const struct wiphy *wiphy, uint8_t *buf, size_t len);
 void wiphy_get_reg_domain_country(struct wiphy *wiphy, char *out);
 bool wiphy_country_is_unknown(struct wiphy *wiphy);
 
+const uint8_t *wiphy_get_ht_capabilities(const struct wiphy *wiphy,
+						enum band_freq band,
+						size_t *size);
 void wiphy_generate_random_address(struct wiphy *wiphy, uint8_t addr[static 6]);
 void wiphy_generate_address_from_ssid(struct wiphy *wiphy, const char *ssid,
 					uint8_t addr[static 6]);