Commit 6d501764 authored by Nathan Errera's avatar Nathan Errera Committed by Johannes Berg
Browse files

mac80211: introduce channel switch disconnect function 



Introduce a disconnect function that can be used when a
channel switch error occurs. The channel switch can request to
block the tx, and so, we need to make sure we do not send a deauth
frame in this case.

Signed-off-by: default avatarNathan Errera <nathan.errera@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211129152938.cd2a615a0702.I9edb14785586344af17644b610ab5be109dcef00@changeid


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

include/net/mac80211.h

+12 −0
Original line number Diff line number Diff line
@@ -6075,6 +6075,18 @@ void ieee80211_radar_detected(struct ieee80211_hw *hw); 
 */

void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success);



/**

 * ieee80211_channel_switch_disconnect - disconnect due to channel switch error

 * @vif &struct ieee80211_vif pointer from the add_interface callback.

 * @block_tx: if %true, do not send deauth frame.

 *

 * Instruct mac80211 to disconnect due to a channel switch error. The channel

 * switch can request to block the tx and so, we need to make sure we do not send

 * a deauth frame in this case.

 */

void ieee80211_channel_switch_disconnect(struct ieee80211_vif *vif,

					 bool block_tx);



/**

 * ieee80211_request_smps - request SM PS transition

 * @vif: &struct ieee80211_vif pointer from the add_interface callback.

net/mac80211/cfg.c

+13 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2010	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2015  Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2020 Intel Corporation

 * Copyright (C) 2018-2021 Intel Corporation

 */



#include <linux/ieee80211.h>
@@ -3198,6 +3198,18 @@ void ieee80211_csa_finish(struct ieee80211_vif *vif) 
}

EXPORT_SYMBOL(ieee80211_csa_finish);



void ieee80211_channel_switch_disconnect(struct ieee80211_vif *vif, bool block_tx)

{

	struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	struct ieee80211_local *local = sdata->local;



	sdata->csa_block_tx = block_tx;

	sdata_info(sdata, "channel switch failed, disconnecting\n");

	ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work);

}

EXPORT_SYMBOL(ieee80211_channel_switch_disconnect);



static int ieee80211_set_after_csa_beacon(struct ieee80211_sub_if_data *sdata,

					  u32 *changed)

{