Commit 61b81b40 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move clearing result into ieee80211_parse_ch_switch_ie() 



Clear the csa_ie in ieee80211_parse_ch_switch_ie() where the data
is filled in, rather than in each caller.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5d55371b

net/mac80211/ibss.c

+0 −1
Original line number Diff line number Diff line
@@ -808,7 +808,6 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
	}



	memset(&params, 0, sizeof(params));

	memset(&csa_ie, 0, sizeof(csa_ie));

	err = ieee80211_parse_ch_switch_ie(sdata, elems,

					   ifibss->chandef.chan->band,

					   sta_flags, ifibss->bssid, &csa_ie);

net/mac80211/mesh.c

+0 −1
Original line number Diff line number Diff line
@@ -960,7 +960,6 @@ ieee80211_mesh_process_chnswitch(struct ieee80211_sub_if_data *sdata, 
	}



	memset(&params, 0, sizeof(params));

	memset(&csa_ie, 0, sizeof(csa_ie));

	err = ieee80211_parse_ch_switch_ie(sdata, elems, sband->band,

					   sta_flags, sdata->vif.addr,

					   &csa_ie);

net/mac80211/mlme.c

+0 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,6 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 
		return;



	current_band = cbss->channel->band;

	memset(&csa_ie, 0, sizeof(csa_ie));

	res = ieee80211_parse_ch_switch_ie(sdata, elems, current_band,

					   ifmgd->flags,

					   ifmgd->associated->bssid, &csa_ie);

net/mac80211/spectmgmt.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, 
	const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie;

	int secondary_channel_offset = -1;



	memset(csa_ie, 0, sizeof(*csa_ie));



	sec_chan_offs = elems->sec_chan_offs;

	wide_bw_chansw_ie = elems->wide_bw_chansw_ie;