Commit 811ed3e2 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: drop struct wfx_ht_info 



This struct is no more used.

Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200115135338.14374-14-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08dced7f

drivers/staging/wfx/sta.c

+3 −15
Original line number Diff line number Diff line
@@ -517,7 +517,6 @@ static void wfx_do_unjoin(struct wfx_vif *wvif) 
	wfx_update_filtering(wvif);

	memset(&wvif->bss_params, 0, sizeof(wvif->bss_params));

	wvif->setbssparams_done = false;

	memset(&wvif->ht_info, 0, sizeof(wvif->ht_info));



done:

	mutex_unlock(&wvif->wdev->conf_mutex);
@@ -812,11 +811,6 @@ static int wfx_upload_beacon(struct wfx_vif *wvif) 
	return 0;

}



static int wfx_is_ht(const struct wfx_ht_info *ht_info)

{

	return ht_info->channel_type != NL80211_CHAN_NO_HT;

}



static void wfx_join_finalize(struct wfx_vif *wvif,

			      struct ieee80211_bss_conf *info)

{
@@ -830,17 +824,12 @@ static void wfx_join_finalize(struct wfx_vif *wvif, 
	rcu_read_lock();

	if (info->bssid && !info->ibss_joined)

		sta = ieee80211_find_sta(wvif->vif, info->bssid);

	if (sta) {

		wvif->ht_info.ht_cap = sta->ht_cap;

	rcu_read_unlock();

	if (sta)

		wvif->bss_params.operational_rate_set =

			wfx_rate_mask_to_hw(wvif->wdev, sta->supp_rates[wvif->channel->band]);

		wvif->ht_info.operation_mode = info->ht_operation_mode;

	} else {

		memset(&wvif->ht_info, 0, sizeof(wvif->ht_info));

	else

		wvif->bss_params.operational_rate_set = -1;

	}

	rcu_read_unlock();



	if (sta &&

	    info->ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT)

		hif_dual_cts_protection(wvif, true);
@@ -1224,7 +1213,6 @@ int wfx_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	WARN(wvif->channel, "channel overwrite");

	wvif->channel = ch;

	wvif->ht_info.channel_type = cfg80211_get_chandef_type(&conf->def);



	return 0;

}

drivers/staging/wfx/sta.h

+0 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ enum wfx_state { 
	WFX_STATE_AP,

};



struct wfx_ht_info {

	struct ieee80211_sta_ht_cap ht_cap;

	enum nl80211_channel_type channel_type;

	u16 operation_mode;

};



struct wfx_hif_event {

	struct list_head link;

	struct hif_ind_event evt;

drivers/staging/wfx/wfx.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ struct wfx_vif { 
	u32			erp_info;

	int			cqm_rssi_thold;

	bool			setbssparams_done;

	struct wfx_ht_info	ht_info;

	unsigned long		uapsd_mask;

	struct ieee80211_tx_queue_params edca_params[IEEE80211_NUM_ACS];

	struct hif_req_set_bss_params bss_params;