Skip to content

Commit f08c8cb

Browse files
committed
mac80211: fix 6GHz and refresh patch
Fixes: #14087
1 parent 03c6123 commit f08c8cb

9 files changed

Lines changed: 17 additions & 20 deletions

package/kernel/mac80211/files/lib/wifi/mac80211.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ mac80211_emit_detect() {
356356

357357
case "$band" in
358358
6g)
359-
[ -n "$default_country" ] || country="00"
360359
[ -n "$encryption" ] || encryption="owe"
361360
;;
362361
*)

package/kernel/mac80211/patches/ath10k/991-ath10k-fix-kernel-6.12-support.patch

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
2-
index 23f366221939..2f8c785277af 100644
31
--- a/drivers/net/wireless/ath/ath10k/pci.c
42
+++ b/drivers/net/wireless/ath/ath10k/pci.c
5-
@@ -3148,7 +3148,7 @@ static int ath10k_pci_napi_poll(struct napi_struct *ctx, int budget)
3+
@@ -3164,7 +3164,7 @@ static int ath10k_pci_napi_poll(struct n
64
* immediate servicing.
75
*/
86
if (ath10k_ce_interrupt_summary(ar)) {

package/kernel/mac80211/patches/ath12k/100-ath12k-prevent-ltssm-startup-crash.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ But have issues on BPI-Rx boards.
55

66
--- a/drivers/net/wireless/ath/ath12k/pci.c
77
+++ b/drivers/net/wireless/ath/ath12k/pci.c
8-
@@ -277,6 +277,9 @@ static void ath12k_pci_enable_ltssm(stru
8+
@@ -263,6 +263,9 @@ static void ath12k_pci_enable_ltssm(stru
99
u32 val;
1010
int i;
1111

package/kernel/mac80211/patches/ath12k/102-wifi-ath12k-limit-WMI_SCAN_CHAN_LIST_CMDID-arg.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Best regards,
130130

131131
--- a/drivers/net/wireless/ath/ath12k/wmi.c
132132
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
133-
@@ -2558,6 +2558,9 @@ int ath12k_wmi_send_scan_chan_list_cmd(s
133+
@@ -2461,6 +2461,9 @@ int ath12k_wmi_send_scan_chan_list_cmd(s
134134
max_chan_limit = (wmi->wmi_ab->max_msg_len[ar->pdev_idx] - len) /
135135
sizeof(*chan_info);
136136

@@ -142,7 +142,7 @@ Best regards,
142142
arg->nallchans -= num_send_chans;
143143
--- a/drivers/net/wireless/ath/ath12k/wmi.h
144144
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
145-
@@ -3743,6 +3743,8 @@ struct wmi_stop_scan_cmd {
145+
@@ -3665,6 +3665,8 @@ struct wmi_stop_scan_cmd {
146146
__le32 pdev_id;
147147
} __packed;
148148

package/kernel/mac80211/patches/ath12k/103-wifi-ath12k-fix-5GHz-operation-on-wideband-QCN.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Best regards,
124124

125125
--- a/drivers/net/wireless/ath/ath12k/mac.c
126126
+++ b/drivers/net/wireless/ath/ath12k/mac.c
127-
@@ -5185,9 +5185,7 @@ static void ath12k_mac_setup_ht_vht_cap(
127+
@@ -4283,9 +4283,7 @@ static void ath12k_mac_setup_ht_vht_cap(
128128
rate_cap_rx_chainmask);
129129
}
130130

package/kernel/mac80211/patches/brcm/870-brcmfmac-6.12-support..patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
22
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
3-
@@ -582,18 +582,28 @@
3+
@@ -582,18 +582,28 @@ static int __init brcmf_common_pd_probe(
44
return 0;
55
}
66

@@ -31,7 +31,7 @@
3131
}
3232
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
3333
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
34-
@@ -1184,7 +1184,9 @@
34+
@@ -1184,7 +1184,9 @@ static ssize_t bus_reset_write(struct fi
3535

3636
static const struct file_operations bus_reset_fops = {
3737
.open = simple_open,
@@ -43,7 +43,7 @@
4343

4444
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
4545
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
46-
@@ -2707,7 +2707,9 @@
46+
@@ -2707,7 +2707,9 @@ MODULE_DEVICE_TABLE(pci, brcmf_pcie_devi
4747

4848

4949
static struct pci_driver brcmf_pciedrvr = {

package/kernel/mac80211/patches/build/221-brcmfmac_usb_driver_backport.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
22
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
3-
@@ -1581,7 +1581,11 @@
3+
@@ -1581,7 +1581,11 @@ static int brcmf_usb_reset_device(struct
44

55
void brcmf_usb_exit(void)
66
{

package/kernel/mac80211/patches/build/900-fix-iwlwifi-build-with-kernel-6.12.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
22
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
3-
@@ -679,8 +679,13 @@
3+
@@ -679,8 +679,13 @@ static int iwl_mvm_tzone_get_trip_type(s
44
}
55
#endif
66

@@ -14,7 +14,7 @@
1414
{
1515
struct iwl_mvm *mvm = thermal_zone_device_priv(device);
1616
struct iwl_mvm_thermal_device *tzone;
17-
@@ -754,8 +759,10 @@
17+
@@ -754,8 +759,10 @@ static struct thermal_zone_device_ops t
1818
.set_trip_temp = iwl_mvm_tzone_set_trip_temp,
1919
};
2020

@@ -25,7 +25,7 @@
2525

2626
static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm)
2727
{
28-
@@ -779,7 +786,9 @@
28+
@@ -779,7 +786,9 @@ static void iwl_mvm_thermal_zone_registe
2929
mvm->tz_device.trips,
3030
#endif
3131
IWL_MAX_DTS_TRIPS,

package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,18 @@ Signed-off-by: Gautham Kumar Senthilkumaran <quic_gauthamk@quicinc.com>
121121
/* keep last, obviously */
122122
NUM_IEEE80211_HW_FLAGS
123123
@@ -4520,6 +4541,8 @@ struct ieee80211_prep_tx_info {
124-
* @set_sar_specs: Update the SAR (TX power) settings.
125-
* @sta_set_decap_offload: Called to notify the driver when a station is allowed
126124
* to use rx decapsulation offload
125+
* @sta_set_airtime_weight: Called to notify the driver of a change to a
126+
* station's airtime fairness weight, so it can be programmed in hardware.
127127
+ * @config_mesh_offload_path: Configure mesh path table when driver supports mesh offload.
128128
+ * This calback must be atomic.
129129
* @add_twt_setup: Update hw with TWT agreement parameters received from the peer.
130130
* This callback allows the hw to check if requested parameters
131131
* are supported and if there is enough room for a new agreement.
132132
@@ -4935,6 +4958,12 @@ struct ieee80211_ops {
133-
void (*sta_set_decap_offload)(struct ieee80211_hw *hw,
134-
struct ieee80211_vif *vif,
135-
struct ieee80211_sta *sta, bool enabled);
133+
void (*sta_set_airtime_weight)(struct ieee80211_hw *hw,
134+
struct ieee80211_vif *vif,
135+
struct ieee80211_sta *sta, u16 weight);
136136
+#ifdef CPTCFG_MAC80211_MESH
137137
+ void (*config_mesh_offload_path)(struct ieee80211_hw *hw,
138138
+ struct ieee80211_vif *vif,

0 commit comments

Comments
 (0)