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

Commit 18003297 authored by Luciano Coelho's avatar Luciano Coelho Committed by Johannes Berg
Browse files

cfg80211: use the correct macro to check for active monitor support 



Use MONITOR_FLAG_ACTIVE, which is a flag mask, instead of
NL80211_MNTR_FLAG_ACTIVE, which is a flag index, when checking if the
hardware supports active monitoring.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 272b98c6

net/wireless/nl80211.c

+2 −2
Original line number Diff line number Diff line
@@ -2421,7 +2421,7 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info) 
		change = true;

	}



	if (flags && (*flags & NL80211_MNTR_FLAG_ACTIVE) &&

	if (flags && (*flags & MONITOR_FLAG_ACTIVE) &&

	    !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))

		return -EOPNOTSUPP;
@@ -2483,7 +2483,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) 
				  info->attrs[NL80211_ATTR_MNTR_FLAGS] : NULL,

				  &flags);



	if (!err && (flags & NL80211_MNTR_FLAG_ACTIVE) &&

	if (!err && (flags & MONITOR_FLAG_ACTIVE) &&

	    !(rdev->wiphy.features & NL80211_FEATURE_ACTIVE_MONITOR))

		return -EOPNOTSUPP;