mac80211: refresh patch

This commit is contained in:
Lucas Asvio
2025-06-24 13:31:23 +02:00
parent 998892d067
commit e7b322f14d
16 changed files with 22 additions and 24 deletions

View File

@@ -82,7 +82,7 @@
help help
--- a/local-symbols --- a/local-symbols
+++ b/local-symbols +++ b/local-symbols
@@ -96,6 +96,7 @@ ADM8211= @@ -97,6 +97,7 @@ ADM8211=
ATH_COMMON= ATH_COMMON=
WLAN_VENDOR_ATH= WLAN_VENDOR_ATH=
ATH_DEBUG= ATH_DEBUG=

View File

@@ -37,7 +37,7 @@
void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature); void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);
--- a/local-symbols --- a/local-symbols
+++ b/local-symbols +++ b/local-symbols
@@ -156,6 +156,7 @@ ATH10K_DEBUG= @@ -157,6 +157,7 @@ ATH10K_DEBUG=
ATH10K_DEBUGFS= ATH10K_DEBUGFS=
ATH10K_LEDS= ATH10K_LEDS=
ATH10K_SPECTRAL= ATH10K_SPECTRAL=

View File

@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath10k/mac.c --- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -9919,6 +9919,21 @@ static int ath10k_mac_init_rd(struct ath @@ -9921,6 +9921,21 @@ static int ath10k_mac_init_rd(struct ath
return 0; return 0;
} }
@@ -22,7 +22,7 @@
int ath10k_mac_register(struct ath10k *ar) int ath10k_mac_register(struct ath10k *ar)
{ {
static const u32 cipher_suites[] = { static const u32 cipher_suites[] = {
@@ -10281,6 +10296,12 @@ int ath10k_mac_register(struct ath10k *a @@ -10283,6 +10298,12 @@ int ath10k_mac_register(struct ath10k *a
ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;

View File

@@ -40,7 +40,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
if (ret) if (ret)
--- a/drivers/net/wireless/ath/ath10k/mac.c --- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -10297,7 +10297,7 @@ int ath10k_mac_register(struct ath10k *a @@ -10299,7 +10299,7 @@ int ath10k_mac_register(struct ath10k *a
ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
#ifdef CPTCFG_MAC80211_LEDS #ifdef CPTCFG_MAC80211_LEDS

View File

@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/drivers/net/wireless/ath/ath10k/mac.c --- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -10089,7 +10089,6 @@ int ath10k_mac_register(struct ath10k *a @@ -10091,7 +10091,6 @@ int ath10k_mac_register(struct ath10k *a
ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA); ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);

View File

@@ -56,7 +56,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state); int ath11k_thermal_set_throttling(struct ath11k *ar, u32 throttle_state);
--- a/local-symbols --- a/local-symbols
+++ b/local-symbols +++ b/local-symbols
@@ -168,6 +168,7 @@ ATH11K_DEBUG= @@ -169,6 +169,7 @@ ATH11K_DEBUG=
ATH11K_DEBUGFS= ATH11K_DEBUGFS=
ATH11K_TRACING= ATH11K_TRACING=
ATH11K_SPECTRAL= ATH11K_SPECTRAL=

View File

@@ -36,7 +36,7 @@ Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com>
} }
--- a/drivers/net/wireless/ath/ath11k/wmi.c --- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -1854,8 +1854,7 @@ int ath11k_wmi_vdev_install_key(struct a @@ -1856,8 +1856,7 @@ int ath11k_wmi_vdev_install_key(struct a
tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd));
tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |
FIELD_PREP(WMI_TLV_LEN, key_len_aligned); FIELD_PREP(WMI_TLV_LEN, key_len_aligned);

View File

@@ -371,7 +371,7 @@
--- a/local-symbols --- a/local-symbols
+++ b/local-symbols +++ b/local-symbols
@@ -123,6 +123,7 @@ ATH9K_WOW= @@ -124,6 +124,7 @@ ATH9K_WOW=
ATH9K_RFKILL= ATH9K_RFKILL=
ATH9K_CHANNEL_CONTEXT= ATH9K_CHANNEL_CONTEXT=
ATH9K_PCOEM= ATH9K_PCOEM=

View File

@@ -21,7 +21,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/local-symbols --- a/local-symbols
+++ b/local-symbols +++ b/local-symbols
@@ -339,6 +339,7 @@ RT2X00_LIB_FIRMWARE= @@ -340,6 +340,7 @@ RT2X00_LIB_FIRMWARE=
RT2X00_LIB_CRYPTO= RT2X00_LIB_CRYPTO=
RT2X00_LIB_LEDS= RT2X00_LIB_LEDS=
RT2X00_LIB_DEBUGFS= RT2X00_LIB_DEBUGFS=

View File

@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/cfg80211.h --- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h +++ b/include/net/cfg80211.h
@@ -3423,6 +3423,7 @@ enum wiphy_params_flags { @@ -3425,6 +3425,7 @@ enum wiphy_params_flags {
/* The per TXQ device queue limit in airtime */ /* The per TXQ device queue limit in airtime */
#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L 5000 #define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_L 5000
#define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H 12000 #define IEEE80211_DEFAULT_AQL_TXQ_LIMIT_H 12000

View File

@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/cfg80211.h --- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h +++ b/include/net/cfg80211.h
@@ -6271,6 +6271,7 @@ enum ieee80211_ap_reg_power { @@ -6273,6 +6273,7 @@ enum ieee80211_ap_reg_power {
* entered. * entered.
* @links.cac_time_ms: CAC time in ms * @links.cac_time_ms: CAC time in ms
* @valid_links: bitmap describing what elements of @links are valid * @valid_links: bitmap describing what elements of @links are valid
@@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/ */
struct wireless_dev { struct wireless_dev {
struct wiphy *wiphy; struct wiphy *wiphy;
@@ -6383,6 +6384,8 @@ struct wireless_dev { @@ -6385,6 +6386,8 @@ struct wireless_dev {
unsigned int cac_time_ms; unsigned int cac_time_ms;
} links[IEEE80211_MLD_MAX_NUM_LINKS]; } links[IEEE80211_MLD_MAX_NUM_LINKS];
u16 valid_links; u16 valid_links;
@@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
static inline const u8 *wdev_address(struct wireless_dev *wdev) static inline const u8 *wdev_address(struct wireless_dev *wdev)
@@ -6569,6 +6572,17 @@ bool cfg80211_radio_chandef_valid(const @@ -6571,6 +6574,17 @@ bool cfg80211_radio_chandef_valid(const
const struct cfg80211_chan_def *chandef); const struct cfg80211_chan_def *chandef);
/** /**

View File

@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/cfg80211.h --- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h +++ b/include/net/cfg80211.h
@@ -4700,6 +4700,7 @@ struct cfg80211_ops { @@ -4702,6 +4702,7 @@ struct cfg80211_ops {
struct ieee80211_channel *chan); struct ieee80211_channel *chan);
int (*set_monitor_channel)(struct wiphy *wiphy, int (*set_monitor_channel)(struct wiphy *wiphy,

View File

@@ -306,7 +306,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
continue; continue;
break; break;
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
@@ -1856,8 +1857,10 @@ int ieee80211_reconfig(struct ieee80211_ @@ -1858,8 +1859,10 @@ int ieee80211_reconfig(struct ieee80211_
} }
list_for_each_entry(sdata, &local->interfaces, list) { list_for_each_entry(sdata, &local->interfaces, list) {
@@ -318,7 +318,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ieee80211_sdata_running(sdata)) { ieee80211_sdata_running(sdata)) {
res = drv_add_interface(local, sdata); res = drv_add_interface(local, sdata);
if (WARN_ON(res)) if (WARN_ON(res))
@@ -1870,11 +1873,14 @@ int ieee80211_reconfig(struct ieee80211_ @@ -1872,11 +1875,14 @@ int ieee80211_reconfig(struct ieee80211_
*/ */
if (res) { if (res) {
list_for_each_entry_continue_reverse(sdata, &local->interfaces, list_for_each_entry_continue_reverse(sdata, &local->interfaces,

View File

@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/cfg80211.h --- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h +++ b/include/net/cfg80211.h
@@ -2272,6 +2272,7 @@ static inline int cfg80211_get_station(s @@ -2274,6 +2274,7 @@ static inline int cfg80211_get_station(s
* @MONITOR_FLAG_OTHER_BSS: disable BSSID filtering * @MONITOR_FLAG_OTHER_BSS: disable BSSID filtering
* @MONITOR_FLAG_COOK_FRAMES: report frames after processing * @MONITOR_FLAG_COOK_FRAMES: report frames after processing
* @MONITOR_FLAG_ACTIVE: active monitor, ACKs frames on its MAC address * @MONITOR_FLAG_ACTIVE: active monitor, ACKs frames on its MAC address
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/ */
enum monitor_flags { enum monitor_flags {
MONITOR_FLAG_CHANGED = BIT(__NL80211_MNTR_FLAG_INVALID), MONITOR_FLAG_CHANGED = BIT(__NL80211_MNTR_FLAG_INVALID),
@@ -2281,6 +2282,7 @@ enum monitor_flags { @@ -2283,6 +2284,7 @@ enum monitor_flags {
MONITOR_FLAG_OTHER_BSS = BIT(NL80211_MNTR_FLAG_OTHER_BSS), MONITOR_FLAG_OTHER_BSS = BIT(NL80211_MNTR_FLAG_OTHER_BSS),
MONITOR_FLAG_COOK_FRAMES = BIT(NL80211_MNTR_FLAG_COOK_FRAMES), MONITOR_FLAG_COOK_FRAMES = BIT(NL80211_MNTR_FLAG_COOK_FRAMES),
MONITOR_FLAG_ACTIVE = BIT(NL80211_MNTR_FLAG_ACTIVE), MONITOR_FLAG_ACTIVE = BIT(NL80211_MNTR_FLAG_ACTIVE),

View File

@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/cfg80211.h --- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h +++ b/include/net/cfg80211.h
@@ -5443,6 +5443,8 @@ struct wiphy_radio_freq_range { @@ -5445,6 +5445,8 @@ struct wiphy_radio_freq_range {
* @iface_combinations: Valid interface combinations array, should not * @iface_combinations: Valid interface combinations array, should not
* list single interface types. * list single interface types.
* @n_iface_combinations: number of entries in @iface_combinations array. * @n_iface_combinations: number of entries in @iface_combinations array.
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/ */
struct wiphy_radio { struct wiphy_radio {
const struct wiphy_radio_freq_range *freq_range; const struct wiphy_radio_freq_range *freq_range;
@@ -5450,6 +5452,8 @@ struct wiphy_radio { @@ -5452,6 +5454,8 @@ struct wiphy_radio {
const struct ieee80211_iface_combination *iface_combinations; const struct ieee80211_iface_combination *iface_combinations;
int n_iface_combinations; int n_iface_combinations;

View File

@@ -9,11 +9,9 @@
} }
int ieee80211_emulate_add_chanctx(struct ieee80211_hw *hw, int ieee80211_emulate_add_chanctx(struct ieee80211_hw *hw,
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f6f060c..3bda31a 100644
--- a/net/mac80211/rx.c --- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c +++ b/net/mac80211/rx.c
@@ -2645,7 +2645,7 @@ static void netif_rx_nss(struct ieee80211_rx_data *rx, @@ -2645,7 +2645,7 @@ static void netif_rx_nss(struct ieee8021
skb_push(skb, ETH_HLEN); skb_push(skb, ETH_HLEN);
ret = nss_virt_if_tx_buf(sdata->nssctx, skb); ret = nss_virt_if_tx_buf(sdata->nssctx, skb);
if (ret) { if (ret) {