Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57eebdf3 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: clean up CSA handling code 



Clean up the CSA handling code by moving some
of it out of the if and using a C99 initializer
for the struct passed to the driver method.

While at it, also add a comment that we should
wait for a beacon after switching the channel.

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

net/mac80211/mlme.c

+16 −18
Original line number Diff line number Diff line
@@ -712,6 +712,7 @@ static void ieee80211_chswitch_work(struct work_struct *work) 
	/* XXX: shouldn't really modify cfg80211-owned data! */

	ifmgd->associated->channel = sdata->local->oper_channel;



	/* XXX: wait for a beacon first? */

	ieee80211_wake_queues_by_reason(&sdata->local->hw,

					IEEE80211_QUEUE_STOP_REASON_CSA);

 out:
@@ -788,37 +789,34 @@ void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 


	sdata->local->csa_channel = new_ch;



	if (sdata->local->ops->channel_switch) {

		/* use driver's channel switch callback */

		struct ieee80211_channel_switch ch_switch;

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

		ch_switch.timestamp = timestamp;

		if (sw_elem->mode) {

			ch_switch.block_tx = true;

	ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;



	if (sw_elem->mode)

		ieee80211_stop_queues_by_reason(&sdata->local->hw,

				IEEE80211_QUEUE_STOP_REASON_CSA);

		}

		ch_switch.channel = new_ch;

		ch_switch.count = sw_elem->count;

		ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;



	if (sdata->local->ops->channel_switch) {

		/* use driver's channel switch callback */

		struct ieee80211_channel_switch ch_switch = {

			.timestamp = timestamp,

			.block_tx = sw_elem->mode,

			.channel = new_ch,

			.count = sw_elem->count,

		};



		drv_channel_switch(sdata->local, &ch_switch);

		return;

	}



	/* channel switch handled in software */

	if (sw_elem->count <= 1) {

	if (sw_elem->count <= 1)

		ieee80211_queue_work(&sdata->local->hw, &ifmgd->chswitch_work);

	} else {

		if (sw_elem->mode)

			ieee80211_stop_queues_by_reason(&sdata->local->hw,

					IEEE80211_QUEUE_STOP_REASON_CSA);

		ifmgd->flags |= IEEE80211_STA_CSA_RECEIVED;

	else

		mod_timer(&ifmgd->chswitch_timer,

			  jiffies +

			  msecs_to_jiffies(sw_elem->count *

					   cbss->beacon_interval));

}

}



static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,

					u16 capab_info, u8 *pwr_constr_elem,