linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jerome Pouiller <Jerome.Pouiller@silabs.com>
To: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Kalle Valo" <kvalo@codeaurora.org>,
	"David S . Miller" <davem@davemloft.net>,
	"Jérôme Pouiller" <jerome.pouiller@silabs.com>
Subject: [PATCH 02/31] staging: wfx: relocate wfx_join() beside wfx_join_finalize()
Date: Mon,  7 Sep 2020 12:14:52 +0200	[thread overview]
Message-ID: <20200907101521.66082-3-Jerome.Pouiller@silabs.com> (raw)
In-Reply-To: <20200907101521.66082-1-Jerome.Pouiller@silabs.com>

From: Jérôme Pouiller <jerome.pouiller@silabs.com>

wfx_join() and wfx_join_finalize() are the two halves of the association
process. Group them.

In addition, for better uniformity of the code, rename wfx_do_join() in
wfx_join().

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
---
 drivers/staging/wfx/sta.c | 100 +++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 502967874373..b2a29b2ac20c 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -340,54 +340,6 @@ void wfx_reset(struct wfx_vif *wvif)
 		wfx_update_pm(wvif);
 }
 
-static void wfx_do_join(struct wfx_vif *wvif)
-{
-	int ret;
-	struct ieee80211_bss_conf *conf = &wvif->vif->bss_conf;
-	struct cfg80211_bss *bss = NULL;
-	u8 ssid[IEEE80211_MAX_SSID_LEN];
-	const u8 *ssidie = NULL;
-	int ssidlen = 0;
-
-	wfx_tx_lock_flush(wvif->wdev);
-
-	bss = cfg80211_get_bss(wvif->wdev->hw->wiphy, wvif->channel,
-			       conf->bssid, NULL, 0,
-			       IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
-	if (!bss && !conf->ibss_joined) {
-		wfx_tx_unlock(wvif->wdev);
-		return;
-	}
-
-	rcu_read_lock(); // protect ssidie
-	if (bss)
-		ssidie = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);
-	if (ssidie) {
-		ssidlen = ssidie[1];
-		if (ssidlen > IEEE80211_MAX_SSID_LEN)
-			ssidlen = IEEE80211_MAX_SSID_LEN;
-		memcpy(ssid, &ssidie[2], ssidlen);
-	}
-	rcu_read_unlock();
-
-	cfg80211_put_bss(wvif->wdev->hw->wiphy, bss);
-
-	wvif->join_in_progress = true;
-	ret = hif_join(wvif, conf, wvif->channel, ssid, ssidlen);
-	if (ret) {
-		ieee80211_connection_loss(wvif->vif);
-		wfx_reset(wvif);
-	} else {
-		/* Due to beacon filtering it is possible that the
-		 * AP's beacon is not known for the mac80211 stack.
-		 * Disable filtering temporary to make sure the stack
-		 * receives at least one
-		 */
-		wfx_filter_beacon(wvif, false);
-	}
-	wfx_tx_unlock(wvif->wdev);
-}
-
 int wfx_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 		struct ieee80211_sta *sta)
 {
@@ -496,6 +448,54 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 	wfx_reset(wvif);
 }
 
+static void wfx_join(struct wfx_vif *wvif)
+{
+	int ret;
+	struct ieee80211_bss_conf *conf = &wvif->vif->bss_conf;
+	struct cfg80211_bss *bss = NULL;
+	u8 ssid[IEEE80211_MAX_SSID_LEN];
+	const u8 *ssidie = NULL;
+	int ssidlen = 0;
+
+	wfx_tx_lock_flush(wvif->wdev);
+
+	bss = cfg80211_get_bss(wvif->wdev->hw->wiphy, wvif->channel,
+			       conf->bssid, NULL, 0,
+			       IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
+	if (!bss && !conf->ibss_joined) {
+		wfx_tx_unlock(wvif->wdev);
+		return;
+	}
+
+	rcu_read_lock(); // protect ssidie
+	if (bss)
+		ssidie = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);
+	if (ssidie) {
+		ssidlen = ssidie[1];
+		if (ssidlen > IEEE80211_MAX_SSID_LEN)
+			ssidlen = IEEE80211_MAX_SSID_LEN;
+		memcpy(ssid, &ssidie[2], ssidlen);
+	}
+	rcu_read_unlock();
+
+	cfg80211_put_bss(wvif->wdev->hw->wiphy, bss);
+
+	wvif->join_in_progress = true;
+	ret = hif_join(wvif, conf, wvif->channel, ssid, ssidlen);
+	if (ret) {
+		ieee80211_connection_loss(wvif->vif);
+		wfx_reset(wvif);
+	} else {
+		/* Due to beacon filtering it is possible that the
+		 * AP's beacon is not known for the mac80211 stack.
+		 * Disable filtering temporary to make sure the stack
+		 * receives at least one
+		 */
+		wfx_filter_beacon(wvif, false);
+	}
+	wfx_tx_unlock(wvif->wdev);
+}
+
 static void wfx_join_finalize(struct wfx_vif *wvif,
 			      struct ieee80211_bss_conf *info)
 {
@@ -514,7 +514,7 @@ int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 	struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv;
 
 	wfx_upload_ap_templates(wvif);
-	wfx_do_join(wvif);
+	wfx_join(wvif);
 	return 0;
 }
 
@@ -551,7 +551,7 @@ void wfx_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 	    changed & BSS_CHANGED_BEACON_INT ||
 	    changed & BSS_CHANGED_BSSID) {
 		if (vif->type == NL80211_IFTYPE_STATION)
-			wfx_do_join(wvif);
+			wfx_join(wvif);
 	}
 
 	if (changed & BSS_CHANGED_ASSOC) {
-- 
2.28.0


  parent reply	other threads:[~2020-09-07 10:32 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-07 10:14 [PATCH 00/31] staging: wfx: fix last items of the TODO list Jerome Pouiller
2020-09-07 10:14 ` [PATCH 01/31] staging: wfx: improve readability of association processing Jerome Pouiller
2020-09-07 10:14 ` Jerome Pouiller [this message]
2020-09-07 10:14 ` [PATCH 03/31] staging: wfx: simplify hif_set_association_mode() Jerome Pouiller
2020-09-07 10:14 ` [PATCH 04/31] staging: wfx: keep API error list up-to-date Jerome Pouiller
2020-09-07 10:14 ` [PATCH 05/31] staging: wfx: drop 'secure link' feature Jerome Pouiller
2020-09-07 10:14 ` [PATCH 06/31] staging: wfx: drop multicast filtering Jerome Pouiller
2020-09-07 10:14 ` [PATCH 07/31] staging: wfx: drop useless function Jerome Pouiller
2020-09-07 10:14 ` [PATCH 08/31] staging: wfx: drop useless enum hif_beacon Jerome Pouiller
2020-09-07 10:14 ` [PATCH 09/31] staging: wfx: drop useless union hif_commands_ids Jerome Pouiller
2020-09-07 10:15 ` [PATCH 10/31] staging: wfx: drop useless struct hif_reset_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 11/31] staging: wfx: drop useless struct hif_ie_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 12/31] staging: wfx: drop useless struct hif_join_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 13/31] staging: wfx: drop useless struct hif_bss_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 14/31] staging: wfx: drop useless struct hif_map_link_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 15/31] staging: wfx: drop useless struct hif_suspend_resume_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 16/31] staging: wfx: drop useless struct hif_pm_mode Jerome Pouiller
2020-09-07 10:15 ` [PATCH 17/31] staging: wfx: drop useless struct hif_rx_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 18/31] staging: wfx: drop useless struct hif_tx_result_flags Jerome Pouiller
2020-09-07 10:15 ` [PATCH 19/31] staging: wfx: drop useless structs only used in hif_req_tx Jerome Pouiller
2020-09-07 10:15 ` [PATCH 20/31] staging: wfx: drop useless stricts only used in hif_req_start_scan_alt Jerome Pouiller
2020-09-07 10:15 ` [PATCH 21/31] staging: wfx: drop useless structs only used in hif_ind_startup Jerome Pouiller
2020-09-07 10:15 ` [PATCH 22/31] staging: wfx: drop useless union hif_privacy_key_data Jerome Pouiller
2020-09-07 10:15 ` [PATCH 23/31] staging: wfx: drop useless union hif_event_data Jerome Pouiller
2020-09-07 10:15 ` [PATCH 24/31] staging: wfx: drop useless union hif_indication_data Jerome Pouiller
2020-09-07 10:15 ` [PATCH 25/31] staging: wfx: drop struct hif_ie_tlv Jerome Pouiller
2020-09-07 10:15 ` [PATCH 26/31] staging: wfx: drop macro API_SSID_SIZE Jerome Pouiller
2020-09-07 10:15 ` [PATCH 27/31] staging: wfx: fix naming of hif_tx_rate_retry_policy Jerome Pouiller
2020-09-07 10:15 ` [PATCH 28/31] staging: wfx: fix spaces Jerome Pouiller
2020-09-07 10:15 ` [PATCH 29/31] staging: wfx: uniformize naming rules in hif_tx_mib.c Jerome Pouiller
2020-09-07 10:15 ` [PATCH 30/31] staging: wfx: drop async field from struct hif_cmd Jerome Pouiller
2020-09-07 10:15 ` [PATCH 31/31] staging: wfx: update TODO list Jerome Pouiller

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=20200907101521.66082-3-Jerome.Pouiller@silabs.com \
    --to=jerome.pouiller@silabs.com \
    --cc=davem@davemloft.net \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=kvalo@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@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).