mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-06 19:19:31 +00:00
7e42fdcafe
This updates mac80211 to version 6.1.110-1. This code is based on Linux 6.1.110 and contains all fixes included in the upstream wireless subsystem from that kernel version. This includes many bugfixes and also some security fixes. The removed patches are already integrated in upstream Linux 6.1.110. The following patches were integrated in upstream Linux: subsys/311-v6.2-wifi-mac80211-fix-and-simplify-unencrypted-drop-chec.patch subsys/312-v6.3-wifi-cfg80211-move-A-MSDU-check-in-ieee80211_data_to.patch subsys/313-v6.3-wifi-cfg80211-factor-out-bridge-tunnel-RFC1042-heade.patch subsys/314-v6.3-wifi-mac80211-remove-mesh-forwarding-congestion-chec.patch subsys/315-v6.3-wifi-mac80211-fix-receiving-A-MSDU-frames-on-mesh-in.patch subsys/316-v6.3-wifi-mac80211-add-a-workaround-for-receiving-non-sta.patch subsys/321-mac80211-fix-mesh-forwarding.patch subsys/322-wifi-mac80211-fix-mesh-path-discovery-based-on-unica.patch subsys/329-wifi-mac80211-fix-receiving-mesh-packets-in-forwardi.patch subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch subsys/350-v6.3-wifi-mac80211-Allow-NSS-change-only-up-to-capability.patch subsys/351-v6.9-wifi-mac80211-track-capability-opmode-NSS-separately.patch Link: https://github.com/openwrt/openwrt/pull/16368 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 638b26652b0438563a76ec90014c8cba34db982b Mon Sep 17 00:00:00 2001
|
|
From: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
|
|
Date: Thu, 6 Oct 2022 06:28:42 +0530
|
|
Subject: [PATCH 7/9] wifi: ath11k: suppress add interface error
|
|
|
|
In the VIF (other than monitor type) creation request, we should not
|
|
throw the error code when the monitor VIF creation fails, since the
|
|
actual VIF creation succeeds. If we throw the error code from driver
|
|
then the actual VIF creation get fail. So suppress the monitor VIF
|
|
creation error by throwing warning message instead of error code.
|
|
|
|
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.6.0.1-00760-QCAHKSWPL_SILICONZ-1
|
|
|
|
Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20221006005842.8599-1-quic_periyasa@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 9 +++------
|
|
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -6425,18 +6425,16 @@ static int ath11k_mac_op_add_interface(s
|
|
|
|
ath11k_dp_vdev_tx_attach(ar, arvif);
|
|
|
|
+ ath11k_debugfs_add_interface(arvif);
|
|
+
|
|
if (vif->type != NL80211_IFTYPE_MONITOR &&
|
|
test_bit(ATH11K_FLAG_MONITOR_CONF_ENABLED, &ar->monitor_flags)) {
|
|
ret = ath11k_mac_monitor_vdev_create(ar);
|
|
- if (ret) {
|
|
+ if (ret)
|
|
ath11k_warn(ar->ab, "failed to create monitor vdev during add interface: %d",
|
|
ret);
|
|
- goto err_peer_del;
|
|
- }
|
|
}
|
|
|
|
- ath11k_debugfs_add_interface(arvif);
|
|
-
|
|
mutex_unlock(&ar->conf_mutex);
|
|
|
|
return 0;
|
|
@@ -6461,7 +6459,6 @@ err_vdev_del:
|
|
spin_unlock_bh(&ar->data_lock);
|
|
|
|
err:
|
|
- ath11k_debugfs_remove_interface(arvif);
|
|
mutex_unlock(&ar->conf_mutex);
|
|
|
|
return ret;
|