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

Commit 1c53930c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "cfg80211: Add new wiphy flag WIPHY_FLAG_DFS_OFFLOAD""

parents 9b0a202a 9d3453ad

include/net/cfg80211.h

+0 −2
Original line number Diff line number Diff line
@@ -3304,7 +3304,6 @@ struct cfg80211_ops { 
 *	beaconing mode (AP, IBSS, Mesh, ...).

 * @WIPHY_FLAG_HAS_STATIC_WEP: The device supports static WEP key installation

 *	before connection.

 * @WIPHY_FLAG_DFS_OFFLOAD: The driver handles all the DFS related operations.

 */

enum wiphy_flags {

	/* use hole at 0 */
@@ -3331,7 +3330,6 @@ enum wiphy_flags { 
	WIPHY_FLAG_SUPPORTS_5_10_MHZ		= BIT(22),

	WIPHY_FLAG_HAS_CHANNEL_SWITCH		= BIT(23),

	WIPHY_FLAG_HAS_STATIC_WEP		= BIT(24),

	WIPHY_FLAG_DFS_OFFLOAD                  = BIT(25)

};



/**

net/wireless/chan.c

+7 −2
Original line number Diff line number Diff line
@@ -581,6 +581,10 @@ static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy, 
{

	struct ieee80211_channel *c;

	u32 freq, start_freq, end_freq;

	bool dfs_offload;



	dfs_offload = wiphy_ext_feature_isset(wiphy,

					      NL80211_EXT_FEATURE_DFS_OFFLOAD);



	start_freq = cfg80211_get_start_freq(center_freq, bandwidth);

	end_freq = cfg80211_get_end_freq(center_freq, bandwidth);
@@ -599,7 +603,8 @@ static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy, 
			return false;



		if ((c->flags & IEEE80211_CHAN_RADAR) &&

		    (c->dfs_state != NL80211_DFS_AVAILABLE))

		    (c->dfs_state != NL80211_DFS_AVAILABLE) &&

		    !(c->dfs_state == NL80211_DFS_USABLE && dfs_offload))

			return false;

	}