b4b9288f2a
Updates backports to kernel version 6.12.44. This includes many fixes for normal and security bugs. The removed patches were applied upstream and backported to kernel 6.12.44. This is based on the same backports code as used for the old tar based on kernel 6.12.6. removed upstream patches: ath11k/001-wifi-ath11k-Fix-DMA-buffer-allocation-to-resolve-SWIOTLB-issues.patch [1] ath11k/002-wifi-ath11k-use-dma-alloc-noncoherent-for-rx-tid-buffer-allocation.patch [2] rtl/050-wifi-rtlwifi-rtl8821ae-phy-restore-removed-code-to-f.patch [3] subsys/400-v6.16-wifi-mac80211-do-not-offer-a-mesh-path-if-forwarding.patch [4] Part of the following patch was merged upstream: subsys/350-wifi-mac80211-Add-link-iteration-macro-for-link-data.patch [5] [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=b92c5179db4b19152c6492d1dfda457bff789272 [2]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=115360031be90aa6cf11d718caf19fea94824285 [3]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=411c7738669907b5e2288ee7a0396ec0980e58fc [4]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=4c43d2c649269e91a81cbc6b2d6b7c552d3eeb45 [5]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=a4afc3d522ca03920fe14c2b95638237fb6edbd8 Link: https://github.com/openwrt/openwrt/pull/19920 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
65 lines
2.3 KiB
Diff
65 lines
2.3 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Wed, 7 Aug 2024 13:31:07 +0200
|
|
Subject: [PATCH] wifi: cfg80211: report per wiphy radio antenna mask
|
|
|
|
With multi-radio devices, each radio typically gets a fixed set of antennas.
|
|
In order to be able to disable specific antennas for some radios, user space
|
|
needs to know which antenna mask bits are assigned to which radio.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/include/net/cfg80211.h
|
|
+++ b/include/net/cfg80211.h
|
|
@@ -5446,6 +5446,8 @@ struct wiphy_radio_freq_range {
|
|
* @iface_combinations: Valid interface combinations array, should not
|
|
* list single interface types.
|
|
* @n_iface_combinations: number of entries in @iface_combinations array.
|
|
+ *
|
|
+ * @antenna_mask: bitmask of antennas connected to this radio.
|
|
*/
|
|
struct wiphy_radio {
|
|
const struct wiphy_radio_freq_range *freq_range;
|
|
@@ -5453,6 +5455,8 @@ struct wiphy_radio {
|
|
|
|
const struct ieee80211_iface_combination *iface_combinations;
|
|
int n_iface_combinations;
|
|
+
|
|
+ u32 antenna_mask;
|
|
};
|
|
|
|
#define CFG80211_HW_TIMESTAMP_ALL_PEERS 0xffff
|
|
--- a/include/uapi/linux/nl80211.h
|
|
+++ b/include/uapi/linux/nl80211.h
|
|
@@ -8044,6 +8044,8 @@ enum nl80211_ap_settings_flags {
|
|
* @NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION: Supported interface
|
|
* combination for this radio. Attribute may be present multiple times
|
|
* and contains attributes defined in &enum nl80211_if_combination_attrs.
|
|
+ * @NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK: bitmask (u32) of antennas
|
|
+ * connected to this radio.
|
|
*
|
|
* @__NL80211_WIPHY_RADIO_ATTR_LAST: Internal
|
|
* @NL80211_WIPHY_RADIO_ATTR_MAX: Highest attribute
|
|
@@ -8054,6 +8056,7 @@ enum nl80211_wiphy_radio_attrs {
|
|
NL80211_WIPHY_RADIO_ATTR_INDEX,
|
|
NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE,
|
|
NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION,
|
|
+ NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK,
|
|
|
|
/* keep last */
|
|
__NL80211_WIPHY_RADIO_ATTR_LAST,
|
|
--- a/net/wireless/nl80211.c
|
|
+++ b/net/wireless/nl80211.c
|
|
@@ -2438,6 +2438,11 @@ static int nl80211_put_radio(struct wiph
|
|
if (nla_put_u32(msg, NL80211_WIPHY_RADIO_ATTR_INDEX, idx))
|
|
goto nla_put_failure;
|
|
|
|
+ if (r->antenna_mask &&
|
|
+ nla_put_u32(msg, NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK,
|
|
+ r->antenna_mask))
|
|
+ goto nla_put_failure;
|
|
+
|
|
for (i = 0; i < r->n_freq_range; i++) {
|
|
const struct wiphy_radio_freq_range *range = &r->freq_range[i];
|
|
|