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

Commit 36b77135 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cfg80211: Bypass checkin the CHAN_RADAR if DFS_OFFLOAD is enabled" into msm-4.8

parents 73bc9679 161ec3cc
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -596,10 +596,12 @@ static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy,

		if (!c)
			return false;
		/* check for radar flags */

		if ((!(wiphy->flags & WIPHY_FLAG_DFS_OFFLOAD)) &&
		    (prohibited_flags & c->flags & IEEE80211_CHAN_RADAR) &&
		    (c->dfs_state != NL80211_DFS_AVAILABLE))
		    (c->flags & prohibited_flags & IEEE80211_CHAN_RADAR))
			return false;

		if (c->flags & prohibited_flags & ~IEEE80211_CHAN_RADAR)
			return false;
	}
	return true;