Commit be22179c authored by Alexander Wetzel's avatar Alexander Wetzel Committed by Johannes Berg
Browse files

wifi: nl80211/cfg80211: Stop supporting cooked monitor 



Unconditionally start to refuse creating cooked monitor interfaces to
phase them out.

There is no feature flag for drivers to opt-in for cooked monitor and
all known users are using/preferring the modern API since the hostapd
release 1.0 in May 2012.

Signed-off-by: default avatarAlexander Wetzel <Alexander@wetzel-home.de>
Link: https://patch.msgid.link/20250204111352.7004-1-Alexander@wetzel-home.de


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f5903ca2

include/net/cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -2265,7 +2265,7 @@ static inline int cfg80211_get_station(struct net_device *dev, 
 * @MONITOR_FLAG_PLCPFAIL: pass frames with bad PLCP

 * @MONITOR_FLAG_CONTROL: pass control frames

 * @MONITOR_FLAG_OTHER_BSS: disable BSSID filtering

 * @MONITOR_FLAG_COOK_FRAMES: report frames after processing

 * @MONITOR_FLAG_COOK_FRAMES: deprecated, will unconditionally be refused

 * @MONITOR_FLAG_ACTIVE: active monitor, ACKs frames on its MAC address

 * @MONITOR_FLAG_SKIP_TX: do not pass locally transmitted frames

 */

include/uapi/linux/nl80211.h

+2 −2
Original line number Diff line number Diff line
@@ -4727,8 +4727,8 @@ enum nl80211_survey_info { 
 * @NL80211_MNTR_FLAG_PLCPFAIL: pass frames with bad PLCP

 * @NL80211_MNTR_FLAG_CONTROL: pass control frames

 * @NL80211_MNTR_FLAG_OTHER_BSS: disable BSSID filtering

 * @NL80211_MNTR_FLAG_COOK_FRAMES: report frames after processing.

 *	overrides all other flags.

 * @NL80211_MNTR_FLAG_COOK_FRAMES: deprecated

 *	will unconditionally be refused

 * @NL80211_MNTR_FLAG_ACTIVE: use the configured MAC address

 *	and ACK incoming unicast packets.

 * @NL80211_MNTR_FLAG_SKIP_TX: do not pass local tx packets

net/wireless/nl80211.c

+4 −0
Original line number Diff line number Diff line
@@ -4245,6 +4245,10 @@ static int nl80211_parse_mon_options(struct cfg80211_registered_device *rdev, 
		change = true;

	}









	/* MONITOR_FLAG_COOK_FRAMES is deprecated, refuse cooperation */









	if (params->flags & MONITOR_FLAG_COOK_FRAMES)









		return -EOPNOTSUPP;

















	if (params->flags & MONITOR_FLAG_ACTIVE &&









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









		return -EOPNOTSUPP;