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

Commit 0c2900f1 authored Jun 18, 2020 by Will McVicker

ANDROID: GKI: cfg80211: add ABI changes for CONFIG_NL80211_TESTMODE



This change adds the ABI requirements for CONFIG_NL80211_TESTMODE. This
allows vendors to enable the config without breaking ABI compatibility.

Bug: 159371702
Bug: 159417269
Change-Id: I6f8968d3be0c5e58bf921a93ae421882078edca9
Signed-off-by: Will McVicker <willmcvicker@google.com>

parent 2b9ea31a

include/net/cfg80211.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3419,13 +3419,11 @@ struct cfg80211_ops {

	void (rfkill_poll)(struct wiphy wiphy);		void (rfkill_poll)(struct wiphy wiphy);

	#ifdef CONFIG_NL80211_TESTMODE
	int (testmode_cmd)(struct wiphy wiphy, struct wireless_dev *wdev,		int (testmode_cmd)(struct wiphy wiphy, struct wireless_dev *wdev,
	void *data, int len);		void *data, int len);
	int (testmode_dump)(struct wiphy wiphy, struct sk_buff *skb,		int (testmode_dump)(struct wiphy wiphy, struct sk_buff *skb,
	struct netlink_callback *cb,		struct netlink_callback *cb,
	void *data, int len);		void *data, int len);
	#endif

	int (set_bitrate_mask)(struct wiphy wiphy,		int (set_bitrate_mask)(struct wiphy wiphy,
	struct net_device *dev,		struct net_device *dev,

include/net/mac80211.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3693,13 +3693,11 @@ struct ieee80211_ops {
	struct survey_info *survey);		struct survey_info *survey);
	void (rfkill_poll)(struct ieee80211_hw hw);		void (rfkill_poll)(struct ieee80211_hw hw);
	void (set_coverage_class)(struct ieee80211_hw hw, s16 coverage_class);		void (set_coverage_class)(struct ieee80211_hw hw, s16 coverage_class);
	#ifdef CONFIG_NL80211_TESTMODE
	int (testmode_cmd)(struct ieee80211_hw hw, struct ieee80211_vif *vif,		int (testmode_cmd)(struct ieee80211_hw hw, struct ieee80211_vif *vif,
	void *data, int len);		void *data, int len);
	int (testmode_dump)(struct ieee80211_hw hw, struct sk_buff *skb,		int (testmode_dump)(struct ieee80211_hw hw, struct sk_buff *skb,
	struct netlink_callback *cb,		struct netlink_callback *cb,
	void *data, int len);		void *data, int len);
	#endif
	void (flush)(struct ieee80211_hw hw, struct ieee80211_vif *vif,		void (flush)(struct ieee80211_hw hw, struct ieee80211_vif *vif,
	u32 queues, bool drop);		u32 queues, bool drop);
	void (channel_switch)(struct ieee80211_hw hw,		void (channel_switch)(struct ieee80211_hw hw,