lkml.org 
[lkml]   [2020]   [Apr]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 14/16] staging: wfx: simplify wfx_remove_interface()
Date
From: Jérôme Pouiller <jerome.pouiller@silabs.com>

In wfx_remove_interface(), the current code differentiate AP and Station
cases. However, it is not necessary. In all cases, the only important
thing is the call to hif_reset(). We can use the same code to support
all cases.

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

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index bc891b6e4392..1732f3d0a1e5 100644
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -785,24 +785,11 @@ void wfx_remove_interface(struct ieee80211_hw *hw,

mutex_lock(&wdev->conf_mutex);
WARN(wvif->link_id_map != 1, "corrupted state");
- switch (wvif->state) {
- case WFX_STATE_PRE_STA:
- case WFX_STATE_STA:
- case WFX_STATE_IBSS:
- wfx_do_unjoin(wvif);
- break;
- case WFX_STATE_AP:
- /* reset.link_id = 0; */
- hif_reset(wvif, false);
- break;
- default:
- break;
- }

+ hif_reset(wvif, false);
wvif->state = WFX_STATE_PASSIVE;
-
- /* FIXME: In add to reset MAC address, try to reset interface */
hif_set_macaddr(wvif, NULL);
+ wfx_tx_policy_init(wvif);

cancel_delayed_work_sync(&wvif->beacon_loss_work);
wdev->vif[wvif->id] = NULL;
--
2.26.1
\
 
 \ /
  Last update: 2020-04-20 18:05    [W:0.080 / U:2.464 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site