2022-10-06 01:02:38

by Karthikeyan Periyasamy

Subject: [PATCH v2] 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 <[email protected]>
---
v2:
- Modified the commit message

drivers/net/wireless/ath/ath11k/mac.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 84d956ad4093..a8a212d416b2 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6372,18 +6372,16 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,

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;
@@ -6408,7 +6406,6 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,
spin_unlock_bh(&ar->data_lock);

err:
- ath11k_debugfs_remove_interface(arvif);
mutex_unlock(&ar->conf_mutex);

return ret;

base-commit: 15bc43a23ac0504a2a99fceae4a31b8bf37ec8fe
--
2.37.0

2022-10-12 06:42:55

by Kalle Valo

Subject: Re: [PATCH v2] wifi: ath11k: suppress add interface error

Karthikeyan Periyasamy <[email protected]> wrote:

> 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 <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

638b26652b04 wifi: ath11k: suppress add interface error

--
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches