diff options
| author | Jérôme Pouiller <jerome.pouiller@silabs.com> | 2020-04-20 19:02:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-23 14:26:03 +0300 |
| commit | 5c442b6a39e112539144abbfd5e75fe486c3dfab (patch) | |
| tree | 378fb56934f408710b74c2ded98fe9da4e5e5634 /drivers/staging/wfx | |
| parent | 5a0af69888488d2b873f55bcba4cd17b162e4bea (diff) | |
| download | linux-5c442b6a39e112539144abbfd5e75fe486c3dfab.tar.xz | |
staging: wfx: drop useless attribute 'bss_params'
Since wfx_bss_params_work() does not exist anymore, there is no more
reason to keep a copy of bss_params in struct wfx_dev. A local instance
in wfx_join_finalize() is sufficient.
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200420160311.57323-4-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wfx')
| -rw-r--r-- | drivers/staging/wfx/sta.c | 14 | ||||
| -rw-r--r-- | drivers/staging/wfx/wfx.h | 1 |
2 files changed, 6 insertions, 9 deletions
diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c index ca84724e531c..2253ec2bdbf3 100644 --- a/drivers/staging/wfx/sta.c +++ b/drivers/staging/wfx/sta.c @@ -354,7 +354,6 @@ static void wfx_do_unjoin(struct wfx_vif *wvif) wfx_free_event_queue(wvif); cancel_work_sync(&wvif->event_handler_work); - memset(&wvif->bss_params, 0, sizeof(wvif->bss_params)); wfx_tx_unlock(wvif->wdev); cancel_delayed_work_sync(&wvif->beacon_loss_work); } @@ -534,15 +533,16 @@ static void wfx_join_finalize(struct wfx_vif *wvif, struct ieee80211_bss_conf *info) { struct ieee80211_sta *sta = NULL; + struct hif_req_set_bss_params bss_params = { }; rcu_read_lock(); // protect sta if (info->bssid && !info->ibss_joined) sta = ieee80211_find_sta(wvif->vif, info->bssid); if (sta) - wvif->bss_params.operational_rate_set = + bss_params.operational_rate_set = wfx_rate_mask_to_hw(wvif->wdev, sta->supp_rates[wvif->channel->band]); else - wvif->bss_params.operational_rate_set = -1; + bss_params.operational_rate_set = -1; rcu_read_unlock(); if (sta && info->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT) @@ -552,15 +552,15 @@ static void wfx_join_finalize(struct wfx_vif *wvif, // beacon_loss_count is defined to 7 in net/mac80211/mlme.c. Let's use // the same value. - wvif->bss_params.beacon_lost_count = 7; - wvif->bss_params.aid = info->aid; + bss_params.beacon_lost_count = 7; + bss_params.aid = info->aid; hif_set_association_mode(wvif, info); if (!info->ibss_joined) { wvif->state = WFX_STATE_STA; hif_keep_alive_period(wvif, 0); - hif_set_bss_params(wvif, &wvif->bss_params); + hif_set_bss_params(wvif, &bss_params); hif_set_beacon_wakeup_period(wvif, 1, 1); wfx_update_pm(wvif); } @@ -841,8 +841,6 @@ int wfx_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) INIT_WORK(&wvif->update_tim_work, wfx_update_tim_work); INIT_DELAYED_WORK(&wvif->beacon_loss_work, wfx_beacon_loss_work); - memset(&wvif->bss_params, 0, sizeof(wvif->bss_params)); - wvif->wep_default_key_id = -1; INIT_WORK(&wvif->wep_key_work, wfx_wep_key_work); diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h index 2747c7cdf4d1..5484e7c64c3c 100644 --- a/drivers/staging/wfx/wfx.h +++ b/drivers/staging/wfx/wfx.h @@ -87,7 +87,6 @@ struct wfx_vif { u8 filter_mcast_addr[8][ETH_ALEN]; unsigned long uapsd_mask; - struct hif_req_set_bss_params bss_params; int join_complete_status; |