Commit 191da271 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211: Do not disconnect on invalid operating class 



Some APs include a non global operating class in their extended channel
switch information element. In such a case, as the operating class is not
known, mac80211 would decide to disconnect.

However the specification states that the operating class needs to be
taken from Annex E, but it does not specify from which table it should be
taken, so it is valid for an AP to use a non global operating class.

To avoid possibly unneeded disconnection, in such a case ignore the
operating class and assume that the current band is used, and if the
resulting channel and band configuration is invalid disconnect.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 3027a8e7

net/mac80211/spectmgmt.c

+3 −4
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2007-2008, Intel Corporation

 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>

 * Copyright (C) 2018        Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -27,7 +28,7 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, 
				 u32 sta_flags, u8 *bssid,

				 struct ieee80211_csa_ie *csa_ie)

{

	enum nl80211_band new_band;

	enum nl80211_band new_band = current_band;

	int new_freq;

	u8 new_chan_no;

	struct ieee80211_channel *new_chan;
@@ -55,15 +56,13 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, 
				elems->ext_chansw_ie->new_operating_class,

				&new_band)) {

			sdata_info(sdata,

				   "cannot understand ECSA IE operating class %d, disconnecting\n",

				   "cannot understand ECSA IE operating class, %d, ignoring\n",

				   elems->ext_chansw_ie->new_operating_class);

			return -EINVAL;

		}

		new_chan_no = elems->ext_chansw_ie->new_ch_num;

		csa_ie->count = elems->ext_chansw_ie->count;

		csa_ie->mode = elems->ext_chansw_ie->mode;

	} else if (elems->ch_switch_ie) {

		new_band = current_band;

		new_chan_no = elems->ch_switch_ie->new_ch_num;

		csa_ie->count = elems->ch_switch_ie->count;

		csa_ie->mode = elems->ch_switch_ie->mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE