From: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
To: <ath12k@lists.infradead.org>, <johannes@sipsolutions.net>
Cc: <linux-wireless@vger.kernel.org>,
Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Subject: [PATCH 12/13] wifi: ath12k: Introduce iface combination cleanup helper
Date: Thu, 28 Mar 2024 12:59:15 +0530 [thread overview]
Message-ID: <20240328072916.1164195-13-quic_periyasa@quicinc.com> (raw)
In-Reply-To: <20240328072916.1164195-1-quic_periyasa@quicinc.com>
Introduce a cleanup helper function to avoid redundant code for iface
combination cleanup. Remove the cleanup code from
ath12k_mac_hw_unregister() and ath12k_mac_hw_register() and replace it
with new cleanup helper function.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1
Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
---
drivers/net/wireless/ath/ath12k/mac.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 52a5fb8b03e9..44c8bf6eb6ae 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -7781,6 +7781,14 @@ static bool ath12k_mac_is_iface_mode_enable(struct ath12k_hw *ah,
return is_enable;
}
+static void ath12k_mac_cleanup_iface_combinations(struct ath12k_hw *ah)
+{
+ struct wiphy *wiphy = ah->hw->wiphy;
+
+ kfree(wiphy->iface_combinations[0].limits);
+ kfree(wiphy->iface_combinations);
+}
+
static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah)
{
struct wiphy *wiphy = ah->hw->wiphy;
@@ -7905,7 +7913,6 @@ static void ath12k_mac_cleanup_unregister(struct ath12k *ar)
static void ath12k_mac_hw_unregister(struct ath12k_hw *ah)
{
struct ieee80211_hw *hw = ah->hw;
- struct wiphy *wiphy = hw->wiphy;
struct ath12k *ar = ath12k_ah_to_ar(ah);
cancel_work_sync(&ar->regd_update_work);
@@ -7914,8 +7921,7 @@ static void ath12k_mac_hw_unregister(struct ath12k_hw *ah)
ath12k_mac_cleanup_unregister(ar);
- kfree(wiphy->iface_combinations[0].limits);
- kfree(wiphy->iface_combinations);
+ ath12k_mac_cleanup_iface_combinations(ah);
SET_IEEE80211_DEV(hw, NULL);
}
@@ -8087,7 +8093,7 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
ret = ieee80211_register_hw(hw);
if (ret) {
ath12k_err(ab, "ieee80211 registration failed: %d\n", ret);
- goto err_free_if_combs;
+ goto err_cleanup_if_combs;
}
if (!ab->hw_params->supports_monitor)
@@ -8110,9 +8116,8 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
err_unregister_hw:
ieee80211_unregister_hw(hw);
-err_free_if_combs:
- kfree(wiphy->iface_combinations[0].limits);
- kfree(wiphy->iface_combinations);
+err_cleanup_if_combs:
+ ath12k_mac_cleanup_iface_combinations(ah);
err_cleanup_unregister:
ath12k_mac_cleanup_unregister(ar);
--
2.34.1
next prev parent reply other threads:[~2024-03-28 7:30 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 7:29 [PATCH 00/13] wifi: Add multi physical hardware iface combination support Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 01/13] wifi: cfg80211: Add provision to advertise multiple radio in one wiphy Karthikeyan Periyasamy
2024-03-28 7:46 ` Johannes Berg
2024-03-29 14:11 ` Vasanthakumar Thiagarajan
2024-03-29 14:30 ` Johannes Berg
2024-03-29 14:47 ` Ben Greear
2024-04-10 7:56 ` Johannes Berg
2024-04-10 14:37 ` Ben Greear
2024-04-10 15:42 ` Johannes Berg
2024-04-10 16:23 ` Ben Greear
2024-04-10 16:43 ` Jeff Johnson
2024-04-10 18:08 ` Maxime Bizon
2024-04-11 16:26 ` Vasanthakumar Thiagarajan
2024-04-11 16:39 ` Maxime Bizon
2024-04-12 3:50 ` Vasanthakumar Thiagarajan
2024-04-12 7:38 ` Nicolas Escande
2024-04-12 8:01 ` Vasanthakumar Thiagarajan
2024-04-12 12:00 ` James Dutton
2024-04-12 14:39 ` Vasanthakumar Thiagarajan
2024-04-10 18:01 ` Maxime Bizon
2024-04-10 21:03 ` Ben Greear
2024-04-12 4:11 ` Vasanthakumar Thiagarajan
2024-04-12 14:08 ` Ben Greear
2024-04-12 14:31 ` Vasanthakumar Thiagarajan
2024-04-12 15:58 ` Ben Greear
2024-04-13 15:40 ` Ben Greear
2024-04-14 16:02 ` Vasanthakumar Thiagarajan
2024-04-15 13:59 ` Ben Greear
2024-04-14 15:52 ` Vasanthakumar Thiagarajan
2024-04-15 13:53 ` Ben Greear
2024-04-01 4:19 ` Karthikeyan Periyasamy
2024-04-10 9:08 ` Karthikeyan Periyasamy
2024-04-10 9:09 ` Johannes Berg
2024-04-10 9:15 ` Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 02/13] wifi: nl80211: send underlying multi-hardware channel capabilities to user space Karthikeyan Periyasamy
2024-03-28 7:49 ` Johannes Berg
2024-03-28 10:18 ` Karthikeyan Periyasamy
2024-03-28 12:01 ` Johannes Berg
2024-03-28 15:10 ` Karthikeyan Periyasamy
2024-03-28 16:09 ` Johannes Berg
2024-03-28 16:14 ` Jeff Johnson
2024-03-28 16:17 ` Jeff Johnson
2024-03-28 16:17 ` Johannes Berg
2024-03-28 16:18 ` Johannes Berg
2024-03-28 18:49 ` Jakub Kicinski
2024-03-28 18:53 ` Johannes Berg
2024-03-28 18:57 ` Jakub Kicinski
2024-03-28 19:32 ` Johannes Berg
2024-03-29 14:21 ` Vasanthakumar Thiagarajan
2024-04-10 7:59 ` Johannes Berg
2024-04-10 16:52 ` Jeff Johnson
2024-03-28 7:29 ` [PATCH 03/13] wifi: cfg80211: Refactor the interface combination limit check Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 04/13] wifi: cfg80211/mac80211: extend iface comb advertisement for multi-hardware dev Karthikeyan Periyasamy
2024-03-28 13:22 ` Johannes Berg
2024-04-01 9:56 ` Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 05/13] wifi: nl80211: Refactor the interface combination limit check Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 06/13] wifi: nl80211: send iface combination to user space in multi-hardware wiphy Karthikeyan Periyasamy
2024-03-28 13:33 ` Johannes Berg
2024-03-28 16:19 ` Jeff Johnson
2024-03-29 14:34 ` Vasanthakumar Thiagarajan
2024-04-10 4:10 ` Karthikeyan Periyasamy
2024-04-10 6:59 ` Johannes Berg
2024-04-12 5:27 ` Karthikeyan Periyasamy
2024-04-15 14:27 ` Johannes Berg
2024-04-15 15:57 ` Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 07/13] wifi: cfg80211/mac80211: Refactor iface comb iterate callback for multi-hardware dev Karthikeyan Periyasamy
2024-03-28 13:36 ` Johannes Berg
2024-03-28 7:29 ` [PATCH 08/13] wifi: cfg80211: Refactor the iface combination iteration helper function Karthikeyan Periyasamy
2024-03-28 13:43 ` Johannes Berg
2024-04-02 16:35 ` Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 09/13] wifi: cfg80211: Add multi-hardware iface combination support Karthikeyan Periyasamy
2024-03-28 14:16 ` Johannes Berg
2024-04-03 9:58 ` Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 10/13] wifi: mac80211: expose channel context helper function Karthikeyan Periyasamy
2024-03-28 7:29 ` [PATCH 11/13] wifi: mac80211: Add multi-hardware support in the iface comb helper Karthikeyan Periyasamy
2024-03-28 14:41 ` Johannes Berg
2024-03-28 16:39 ` Jeff Johnson
2024-04-23 16:01 ` Karthikeyan Periyasamy
2024-03-28 7:29 ` Karthikeyan Periyasamy [this message]
2024-03-28 7:29 ` [PATCH 13/13] wifi: ath12k: Advertise multi hardware iface combination Karthikeyan Periyasamy
2024-03-28 23:42 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240328072916.1164195-13-quic_periyasa@quicinc.com \
--to=quic_periyasa@quicinc.com \
--cc=ath12k@lists.infradead.org \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).