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

Commit 46d53724 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

cfg80211: Fix GO Concurrent relaxation on UNII-3 



At some locations, channels 149-165 are considered a single
bundle, while at some other locations, e.g., Indonesia, channels
149-161 are considered a single bundle, while channel 165 belongs
to a different bundle. This means that:

1. A station interface connection to an AP on channel 165 allows
   the instantiation of a P2P GO on channels 149-165.
2. A station interface connection to an AP on channels 149-161
   does NOT allow the instantiation of a P2P GO on channel 165.

Fix this.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent bc3ce0b0

net/wireless/chan.c

+17 −1
Original line number Diff line number Diff line
@@ -750,9 +750,25 @@ static bool cfg80211_go_permissive_chan(struct cfg80211_registered_device *rdev, 
		r1 = cfg80211_get_unii(chan->center_freq);

		r2 = cfg80211_get_unii(other_chan->center_freq);



		if (r1 != -EINVAL && r1 == r2)

		if (r1 != -EINVAL && r1 == r2) {

			/*

			 * At some locations channels 149-165 are considered a

			 * bundle, but at other locations, e.g., Indonesia,

			 * channels 149-161 are considered a bundle while

			 * channel 165 is left out and considered to be in a

			 * different bundle. Thus, in case that there is a

			 * station interface connected to an AP on channel 165,

			 * it is assumed that channels 149-161 are allowed for

			 * GO operations. However, having a station interface

			 * connected to an AP on channels 149-161, does not

			 * allow GO operation on channel 165.

			 */

			if (chan->center_freq == 5825 &&

			    other_chan->center_freq != 5825)

				continue;

			return true;

		}

	}



	return false;

}