From 0c2900f1aa6e8e79e51e49a72c6b74bfa7495fb4 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Thu, 18 Jun 2020 15:17:03 -0700 Subject: [PATCH] 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 --- include/net/cfg80211.h | 2 -- include/net/mac80211.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 019d45332217..b0f74536b259 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -3419,13 +3419,11 @@ struct cfg80211_ops { void (*rfkill_poll)(struct wiphy *wiphy); -#ifdef CONFIG_NL80211_TESTMODE int (*testmode_cmd)(struct wiphy *wiphy, struct wireless_dev *wdev, void *data, int len); int (*testmode_dump)(struct wiphy *wiphy, struct sk_buff *skb, struct netlink_callback *cb, void *data, int len); -#endif int (*set_bitrate_mask)(struct wiphy *wiphy, struct net_device *dev, diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5790f55c241d..dc967dd23a8d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3693,13 +3693,11 @@ struct ieee80211_ops { struct survey_info *survey); void (*rfkill_poll)(struct ieee80211_hw *hw); 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, void *data, int len); int (*testmode_dump)(struct ieee80211_hw *hw, struct sk_buff *skb, struct netlink_callback *cb, void *data, int len); -#endif void (*flush)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u32 queues, bool drop); void (*channel_switch)(struct ieee80211_hw *hw,