Skip to content

Commit 454fd69

Browse files
committed
mac80211: update to version 6.12.61
This contains the following commits: ``` git log --oneline v6.12.52...v6.12.61 -- drivers/net/wireless/ net/mac80211/ net/wireless/ a1eb56723b32 wifi: ath12k: correctly handle mcast packets for clients c0a9c2c1b7b9 wifi: mac80211: use wiphy_hrtimer_work for csa.switch_work d4caee32a9f8 wifi: cfg80211: add an hrtimer based delayed work item 6455948c8aab wifi: mac80211: reject address change while connecting 80dc5a2ce5b7 wifi: ath11k: Clear affinity hint before calling ath11k_pcic_free_irq() in error path acd24d509227 wifi: mac80211: skip rate verification for not captured PSDUs 53cf801b8555 wifi: ath11k: zero init info->status in wmi_process_mgmt_tx_comp() e8fa86b0bd96 wifi: mac80211_hwsim: Limit destroy_on_close radio removal to netgroup 77d4afd6c78b Revert "wifi: ath10k: avoid unnecessary wait for service ready message" 07d862c7de3d wifi: ath12k: Increase DP_REO_CMD_RING_SIZE to 256 522734fc807c wifi: mac80211: Track NAN interface start/stop 8db790c2491e wifi: ath10k: Fix connection after GTK rekeying 72f1984246e6 wifi: rtw89: renew a completion for each H2C command waiting C2H event 336da4414300 wifi: rtw89: obtain RX path from ppdu status IE00 da91687f01f4 wifi: mt76: mt7996: fix memory leak on mt7996_mcu_sta_key_tlv error a534dd44b70e wifi: mt76: mt76_eeprom_override to int aa5ed215cfe8 wifi: mt76: mt7996: Temporarily disable EPCS efe2ef24feab wifi: mt76: mt7921: Add 160MHz beamformee capability for mt7922 device 5de410dfb4d9 wifi: mac80211: Fix HE capabilities element check f157d1cb2cdc wifi: iwlwifi: fw: Add ASUS to PPAG and TAS list c9df78e84e85 wifi: mac80211: Fix 6 GHz Band capabilities element advertisement in lower bands 958234997dd5 wifi: rtw89: fix BSSID comparison for non-transmitted BSSID ca18975c4de2 wifi: rtw89: wow: remove notify during WoWLAN net-detect bc1ca06998c1 wifi: rtw88: sdio: use indirect IO for device registers before power-on 8ebef59d0294 wifi: rtw89: print just once for unknown C2H events 5596a90c8952 wifi: mac80211: fix key tailroom accounting leak 23b8682f05ec wifi: mac80211: don't mark keys for inactive links as uploaded e3373f10c6a6 wifi: ath11k: avoid bit operation on key flags 50f50dd024b4 wifi: ath11k: add support for MU EDCA 2a6cd5951ba8 wifi: ath12k: free skb during idr cleanup callback 775e37df2acc wifi: ath11k: Add missing platform IDs for quirk table c4840991ee4c wifi: ath10k: Fix memory leak on unsupported WMI command a6eed58249e7 wifi: brcmfmac: fix crash while sending Action Frames in standalone AP Mode 57100b87c778 wifi: ath12k: fix read pointer after free in ath12k_mac_assign_vif_to_vdev() 4a63523d3541 wifi: cfg80211: Add missing lock in cfg80211_check_and_end_cac() e9fd43b799d2 wifi: rtw89: avoid possible TX wait initialization race b419093e5e42 wifi: mt76: mt7921u: Add VID/PID for Netgear A7500 feb1774aaf85 wifi: mt76: mt7925u: Add VID/PID for Netgear A9000 bd3ac455a88d wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again 8055133a9f64 wifi: rtw89: avoid circular locking dependency in ser_state_run() 1c873416758f wifi: mac80211: fix Rx packet handling when pubsta information is not available 6e7d9fa61d7d wifi: ath10k: avoid unnecessary wait for service ready message 8d4f6ab4c53e wifi: ath12k: fix wrong logging ID used for CE fc00890c55e3 wifi: mt76: mt7915: fix mt7981 pre-calibration e18c4e6ba36c wifi: mt76: mt7996: Convert mt7996_wed_rro_addr to LE f481404a9826 wifi: mt76: mt7996: Fix RX packets configuration for primary WED device 57519239c76c wifi: mt76: fix potential memory leak in mt76_wmac_probe() 27c8e2e4b56f wifi: iwlwifi: Remove redundant header files 605402433eb8 wifi: mwifiex: send world regulatory domain to driver ``` The removed patch was added upstream. Link: openwrt/openwrt#21134 Signed-off-by: Hauke Mehrtens <[email protected]>
1 parent f415748 commit 454fd69

File tree

29 files changed

+65
-131
lines changed

29 files changed

+65
-131
lines changed

package/kernel/mac80211/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ include $(INCLUDE_DIR)/kernel.mk
1010

1111
PKG_NAME:=mac80211
1212

13-
PKG_VERSION:=6.12.52
13+
PKG_VERSION:=6.12.61
1414
PKG_RELEASE:=1
1515
PKG_LICENSE:=GPL-2.0-only
1616
PKG_LICENSE_FILES:=COPYING
1717

1818
PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/
19-
PKG_HASH:=ed6ef4c67e08b294ed1101c7cc5ae584a5f338c99ef95362fa3921eb6d207f5d
19+
PKG_HASH:=9db2f836dba7f38ad68f8798720ad4360bce6a3557bde02b88b3a4f068c77118
2020

2121
PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
2222
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)backports-$(PKG_VERSION)

package/kernel/mac80211/patches/ath10k/930-ath10k_add_tpt_led_trigger.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/net/wireless/ath/ath10k/mac.c
22
+++ b/drivers/net/wireless/ath/ath10k/mac.c
3-
@@ -9924,6 +9924,21 @@ static int ath10k_mac_init_rd(struct ath
3+
@@ -9932,6 +9932,21 @@ static int ath10k_mac_init_rd(struct ath
44
return 0;
55
}
66

@@ -22,7 +22,7 @@
2222
int ath10k_mac_register(struct ath10k *ar)
2323
{
2424
static const u32 cipher_suites[] = {
25-
@@ -10286,6 +10301,12 @@ int ath10k_mac_register(struct ath10k *a
25+
@@ -10294,6 +10309,12 @@ int ath10k_mac_register(struct ath10k *a
2626

2727
ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
2828

package/kernel/mac80211/patches/ath10k/975-ath10k-use-tpt-trigger-by-default.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Signed-off-by: Mathias Kresin <[email protected]>
4040
if (ret)
4141
--- a/drivers/net/wireless/ath/ath10k/mac.c
4242
+++ b/drivers/net/wireless/ath/ath10k/mac.c
43-
@@ -10302,7 +10302,7 @@ int ath10k_mac_register(struct ath10k *a
43+
@@ -10310,7 +10310,7 @@ int ath10k_mac_register(struct ath10k *a
4444
ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;
4545

4646
#ifdef CPTCFG_MAC80211_LEDS

package/kernel/mac80211/patches/ath10k/981-ath10k-adjust-tx-power-reduction-for-US-regulatory-d.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Forwarded: no
2828

2929
--- a/drivers/net/wireless/ath/ath10k/mac.c
3030
+++ b/drivers/net/wireless/ath/ath10k/mac.c
31-
@@ -1022,6 +1022,40 @@ static inline int ath10k_vdev_setup_sync
31+
@@ -1030,6 +1030,40 @@ static inline int ath10k_vdev_setup_sync
3232
return ar->last_wmi_vdev_start_status;
3333
}
3434

@@ -69,7 +69,7 @@ Forwarded: no
6969
static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)
7070
{
7171
struct cfg80211_chan_def *chandef = NULL;
72-
@@ -1054,7 +1088,8 @@ static int ath10k_monitor_vdev_start(str
72+
@@ -1062,7 +1096,8 @@ static int ath10k_monitor_vdev_start(str
7373
arg.channel.min_power = 0;
7474
arg.channel.max_power = channel->max_power * 2;
7575
arg.channel.max_reg_power = channel->max_reg_power * 2;
@@ -79,7 +79,7 @@ Forwarded: no
7979

8080
reinit_completion(&ar->vdev_setup_done);
8181
reinit_completion(&ar->vdev_delete_done);
82-
@@ -1500,7 +1535,8 @@ static int ath10k_vdev_start_restart(str
82+
@@ -1508,7 +1543,8 @@ static int ath10k_vdev_start_restart(str
8383
arg.channel.min_power = 0;
8484
arg.channel.max_power = chandef->chan->max_power * 2;
8585
arg.channel.max_reg_power = chandef->chan->max_reg_power * 2;
@@ -89,7 +89,7 @@ Forwarded: no
8989

9090
if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
9191
arg.ssid = arvif->u.ap.ssid;
92-
@@ -3431,7 +3467,8 @@ static int ath10k_update_channel_list(st
92+
@@ -3439,7 +3475,8 @@ static int ath10k_update_channel_list(st
9393
ch->min_power = 0;
9494
ch->max_power = channel->max_power * 2;
9595
ch->max_reg_power = channel->max_reg_power * 2;

package/kernel/mac80211/patches/ath10k/988-ath10k-always-use-mac80211-loss-detection.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <[email protected]>
1818

1919
--- a/drivers/net/wireless/ath/ath10k/mac.c
2020
+++ b/drivers/net/wireless/ath/ath10k/mac.c
21-
@@ -10094,7 +10094,6 @@ int ath10k_mac_register(struct ath10k *a
21+
@@ -10102,7 +10102,6 @@ int ath10k_mac_register(struct ath10k *a
2222
ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);
2323
ieee80211_hw_set(ar->hw, QUEUE_CONTROL);
2424
ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);

package/kernel/mac80211/patches/ath10k/991-ath10k-support-flush_sta-method.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Tested-by: Florian Maurer <[email protected]>
2929

3030
--- a/drivers/net/wireless/ath/ath10k/mac.c
3131
+++ b/drivers/net/wireless/ath/ath10k/mac.c
32-
@@ -8135,6 +8135,20 @@ static void ath10k_flush(struct ieee8021
32+
@@ -8143,6 +8143,20 @@ static void ath10k_flush(struct ieee8021
3333
mutex_unlock(&ar->conf_mutex);
3434
}
3535

@@ -50,15 +50,15 @@ Tested-by: Florian Maurer <[email protected]>
5050
/* TODO: Implement this function properly
5151
* For now it is needed to reply to Probe Requests in IBSS mode.
5252
* Probably we need this information from FW.
53-
@@ -9486,6 +9500,7 @@ static const struct ieee80211_ops ath10k
53+
@@ -9494,6 +9508,7 @@ static const struct ieee80211_ops ath10k
5454
.set_rts_threshold = ath10k_set_rts_threshold,
5555
.set_frag_threshold = ath10k_mac_op_set_frag_threshold,
5656
.flush = ath10k_flush,
5757
+ .flush_sta = ath10k_mac_op_flush_sta,
5858
.tx_last_beacon = ath10k_tx_last_beacon,
5959
.set_antenna = ath10k_set_antenna,
6060
.get_antenna = ath10k_get_antenna,
61-
@@ -10307,6 +10322,9 @@ int ath10k_mac_register(struct ath10k *a
61+
@@ -10315,6 +10330,9 @@ int ath10k_mac_register(struct ath10k *a
6262
if (!ar->hw_params.hw_ops->set_coverage_class)
6363
ar->ops->set_coverage_class = NULL;
6464

package/kernel/mac80211/patches/ath11k/453-ath11k-add-ath11k_mac_op_flush_sta-to-properly-flush.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Signed-off-by: Florian Maurer <[email protected]>
3131

3232
--- a/drivers/net/wireless/ath/ath11k/mac.c
3333
+++ b/drivers/net/wireless/ath/ath11k/mac.c
34-
@@ -8278,6 +8278,23 @@ static void ath11k_mac_op_flush(struct i
34+
@@ -8327,6 +8327,23 @@ static void ath11k_mac_op_flush(struct i
3535
ath11k_mac_flush_tx_complete(ar);
3636
}
3737

@@ -55,7 +55,7 @@ Signed-off-by: Florian Maurer <[email protected]>
5555
static bool
5656
ath11k_mac_has_single_legacy_rate(struct ath11k *ar,
5757
enum nl80211_band band,
58-
@@ -9910,6 +9927,7 @@ static const struct ieee80211_ops ath11k
58+
@@ -9959,6 +9976,7 @@ static const struct ieee80211_ops ath11k
5959
.set_bitrate_mask = ath11k_mac_op_set_bitrate_mask,
6060
.get_survey = ath11k_mac_op_get_survey,
6161
.flush = ath11k_mac_op_flush,

package/kernel/mac80211/patches/ath11k/903-ath11k-support-setting-FW-memory-mode-via-DT.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Signed-off-by: Robert Marko <[email protected]>
3131
{
3232
.hw_rev = ATH11K_HW_IPQ8074,
3333
.name = "ipq8074 hw2.0",
34-
@@ -2201,7 +2201,8 @@ static void ath11k_core_reset(struct wor
34+
@@ -2239,7 +2239,8 @@ static void ath11k_core_reset(struct wor
3535
static int ath11k_init_hw_params(struct ath11k_base *ab)
3636
{
3737
const struct ath11k_hw_params *hw_params = NULL;
@@ -41,7 +41,7 @@ Signed-off-by: Robert Marko <[email protected]>
4141

4242
for (i = 0; i < ARRAY_SIZE(ath11k_hw_params); i++) {
4343
hw_params = &ath11k_hw_params[i];
44-
@@ -2217,7 +2218,31 @@ static int ath11k_init_hw_params(struct
44+
@@ -2255,7 +2256,31 @@ static int ath11k_init_hw_params(struct
4545

4646
ab->hw_params = *hw_params;
4747

package/kernel/mac80211/patches/ath12k/001-wifi-ath12k-add-11d-scan-offload-support-and-handle-country-code-for-WCN7850.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ Acked-by: Jeff Johnson <[email protected]>
532532
return ret;
533533
}
534534

535-
@@ -5998,7 +6013,7 @@ static int ath12k_mac_start(struct ath12
535+
@@ -6000,7 +6015,7 @@ static int ath12k_mac_start(struct ath12
536536

537537
/* TODO: Do we need to enable ANI? */
538538

@@ -541,7 +541,7 @@ Acked-by: Jeff Johnson <[email protected]>
541541

542542
ar->num_started_vdevs = 0;
543543
ar->num_created_vdevs = 0;
544-
@@ -6178,6 +6193,9 @@ static void ath12k_mac_stop(struct ath12
544+
@@ -6180,6 +6195,9 @@ static void ath12k_mac_stop(struct ath12
545545
cancel_delayed_work_sync(&ar->scan.timeout);
546546
cancel_work_sync(&ar->regd_update_work);
547547
cancel_work_sync(&ar->ab->rfkill_work);
@@ -551,7 +551,7 @@ Acked-by: Jeff Johnson <[email protected]>
551551

552552
spin_lock_bh(&ar->data_lock);
553553
list_for_each_entry_safe(ppdu_stats, tmp, &ar->ppdu_stats_info, list) {
554-
@@ -6424,6 +6442,117 @@ static void ath12k_mac_op_update_vif_off
554+
@@ -6426,6 +6444,117 @@ static void ath12k_mac_op_update_vif_off
555555
ath12k_mac_update_vif_offload(arvif);
556556
}
557557

@@ -669,15 +669,15 @@ Acked-by: Jeff Johnson <[email protected]>
669669
static int ath12k_mac_vdev_create(struct ath12k *ar, struct ieee80211_vif *vif)
670670
{
671671
struct ath12k_hw *ah = ar->ah;
672-
@@ -6538,6 +6667,7 @@ static int ath12k_mac_vdev_create(struct
672+
@@ -6540,6 +6669,7 @@ static int ath12k_mac_vdev_create(struct
673673
arvif->vdev_id, ret);
674674
goto err_peer_del;
675675
}
676676
+ ath12k_mac_11d_scan_stop_all(ar->ab);
677677
break;
678678
case WMI_VDEV_TYPE_STA:
679679
param_id = WMI_STA_PS_PARAM_RX_WAKE_POLICY;
680-
@@ -6576,6 +6706,13 @@ static int ath12k_mac_vdev_create(struct
680+
@@ -6578,6 +6708,13 @@ static int ath12k_mac_vdev_create(struct
681681
arvif->vdev_id, ret);
682682
goto err_peer_del;
683683
}
@@ -691,7 +691,7 @@ Acked-by: Jeff Johnson <[email protected]>
691691
break;
692692
default:
693693
break;
694-
@@ -6916,6 +7053,11 @@ static void ath12k_mac_op_remove_interfa
694+
@@ -6918,6 +7055,11 @@ static void ath12k_mac_op_remove_interfa
695695
ath12k_dbg(ab, ATH12K_DBG_MAC, "mac remove interface (vdev %d)\n",
696696
arvif->vdev_id);
697697

@@ -703,7 +703,7 @@ Acked-by: Jeff Johnson <[email protected]>
703703
if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
704704
ret = ath12k_peer_delete(ar, arvif->vdev_id, vif->addr);
705705
if (ret)
706-
@@ -7756,6 +7898,14 @@ ath12k_mac_op_unassign_vif_chanctx(struc
706+
@@ -7758,6 +7900,14 @@ ath12k_mac_op_unassign_vif_chanctx(struc
707707
ar->num_started_vdevs == 1 && ar->monitor_vdev_created)
708708
ath12k_mac_monitor_stop(ar);
709709

@@ -718,7 +718,7 @@ Acked-by: Jeff Johnson <[email protected]>
718718
mutex_unlock(&ar->conf_mutex);
719719
}
720720

721-
@@ -8294,6 +8444,14 @@ ath12k_mac_op_reconfig_complete(struct i
721+
@@ -8296,6 +8446,14 @@ ath12k_mac_op_reconfig_complete(struct i
722722
ath12k_warn(ar->ab, "pdev %d successfully recovered\n",
723723
ar->pdev->pdev_id);
724724

@@ -733,7 +733,7 @@ Acked-by: Jeff Johnson <[email protected]>
733733
if (ab->is_reset) {
734734
recovery_count = atomic_inc_return(&ab->recovery_count);
735735

736-
@@ -9344,6 +9502,9 @@ static void ath12k_mac_setup(struct ath1
736+
@@ -9346,6 +9504,9 @@ static void ath12k_mac_setup(struct ath1
737737

738738
INIT_WORK(&ar->wmi_mgmt_tx_work, ath12k_mgmt_over_wmi_tx_work);
739739
skb_queue_head_init(&ar->wmi_mgmt_tx_queue);

package/kernel/mac80211/patches/ath12k/002-wifi-ath12k-correctly-handle-mcast-packets-for-clien.patch

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)