mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-30 20:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: wfx: drop unused enum wfx_state

Browse Source 
In former code, the field wvif->state was more or less redundant with
vif->type. With the lasts change it has become unused. It is now time to
drop it.

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200420160311.57323-16-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller
2020-04-20 18:03:10 +02:00
committed by Greg Kroah-Hartman
parent cf24a82bd2
commit 4b815a9da5
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/wfx/sta.c
View File

@@ -286,8 +286,6 @@ void wfx_set_default_unicast_key(struct ieee80211_hw *hw,
// Call it with wdev->conf_mutex locked
static void wfx_do_unjoin(struct wfx_vif *wvif)
{
wvif->state = WFX_STATE_PASSIVE;
/* Unjoin is a reset. */
wfx_tx_lock_flush(wvif->wdev);
hif_reset(wvif, false);
@@ -367,11 +365,6 @@ static void wfx_do_join(struct wfx_vif *wvif)
wfx_do_unjoin(wvif);
} else {
wvif->join_complete_status = 0;
if (wvif->vif->type == NL80211_IFTYPE_ADHOC)
wvif->state = WFX_STATE_IBSS;
else
wvif->state = WFX_STATE_PRE_STA;
/* 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
@@ -448,7 +441,6 @@ int wfx_start_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
{
struct wfx_vif *wvif = (struct wfx_vif *)vif->drv_priv;
wvif->state = WFX_STATE_AP;
wfx_upload_ap_templates(wvif);
hif_start(wvif, &vif->bss_conf, wvif->channel);
return 0;
@@ -462,7 +454,6 @@ void wfx_stop_ap(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
wfx_tx_policy_init(wvif);
if (wvif_count(wvif->wdev) <= 1)
hif_set_block_ack_policy(wvif, 0xFF, 0xFF);
wvif->state = WFX_STATE_PASSIVE;
}
static void wfx_join_finalize(struct wfx_vif *wvif,
@@ -475,9 +466,6 @@ static void wfx_join_finalize(struct wfx_vif *wvif,
hif_set_bss_params(wvif, info->aid, 7);
hif_set_beacon_wakeup_period(wvif, 1, 1);
wfx_update_pm(wvif);
if (!info->ibss_joined)
wvif->state = WFX_STATE_STA;
}
int wfx_join_ibss(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
@@ -787,7 +775,6 @@ void wfx_remove_interface(struct ieee80211_hw *hw,
WARN(wvif->link_id_map != 1, "corrupted state");
hif_reset(wvif, false);
wvif->state = WFX_STATE_PASSIVE;
hif_set_macaddr(wvif, NULL);
wfx_tx_policy_init(wvif);

8
drivers/staging/wfx/sta.h
View File

@@ -15,14 +15,6 @@
struct wfx_dev;
struct wfx_vif;
enum wfx_state {
WFX_STATE_PASSIVE = 0,
WFX_STATE_PRE_STA,
WFX_STATE_STA,
WFX_STATE_IBSS,
WFX_STATE_AP,
};
struct wfx_sta_priv {
int link_id;
int vif_id;

1
drivers/staging/wfx/wfx.h
View File

@@ -66,7 +66,6 @@ struct wfx_vif {
struct ieee80211_vif *vif;
struct ieee80211_channel *channel;
int id;
enum wfx_state state;
u32 link_id_map;