Revert "cfg80211/nl80211: Offload OWE processing to user space"

This reverts commit f57fa308b0d8330580a932dcc5c460e9d2352284.

bssid in cfg80211_update_owe_info need to be changed to peer.

Change-Id: I7cf248926fe1b86c3a75d5441955ce4cb60c91f7
CRs-Fixed: 2414077
Signed-off-by: Min Liu <minliu@codeaurora.org>

2 files changed, 0 insertions, 47 deletions

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 1265820a3802..33ea21ef4c7c 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2447,31 +2447,6 @@ struct cfg80211_external_auth_params {
 };
 
 /**
- * struct cfg80211_update_owe_info - OWE Information
- *
- * This structure provides information needed for the drivers to offload OWE
- * (Oppurtunistic Wireless Encryption) processing to the user space.
- *
- * Commonly used across update_owe request and event interfaces.
- *
- * @bssid: BSSID of the peer from which the OWE processing has to be done.
- * @status: status code, %WLAN_STATUS_SUCCESS for successful OWE info
- *	    processing, use %WLAN_STATUS_UNSPECIFIED_FAILURE if user space
- *	    cannot give you the real status code for failures. Used only for
- *	    OWE update response command interface (user space to driver).
- * @ie: IE's obtained from the peer or constructed by the user space. These are
- *	    the IE's of the remote peer in the event from the host driver and
- *	    the constructed IE's by the user space in the request interface.
- * @ie_len: Length of IE's in octets.
- */
-struct cfg80211_update_owe_info {
-	u8 bssid[ETH_ALEN] __aligned(2);
-	u16 status;
-	const u8 *ie;
-	size_t ie_len;
-};
-
-/**
  * struct cfg80211_ops - backend description for wireless configuration
  *
  * This struct is registered by fullmac card drivers and/or wireless stacks
@@ -2769,10 +2744,6 @@ struct cfg80211_update_owe_info {
  *
  * @external_auth: indicates result of offloaded authentication processing from
  *     user space
- *
- * @update_owe_info: Provide updated OWE info to driver. Driver implementing SME
- *	but offloading the OWE processing to the user space will get the updated
- *	DH IE's (from the IE's) obtained through this interface.
  */
 struct cfg80211_ops {
 	int	(*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
@@ -3044,8 +3015,6 @@ struct cfg80211_ops {
 					      const u8 *addr);
 	int     (*external_auth)(struct wiphy *wiphy, struct net_device *dev,
 				 struct cfg80211_external_auth_params *params);
-	int	(*update_owe_info)(struct wiphy *wiphy, struct net_device *dev,
-				   struct cfg80211_update_owe_info *owe_info);
 };
 
 /*
@@ -5930,14 +5899,4 @@ int cfg80211_external_auth_request(struct net_device *netdev,
 #define wiphy_WARN(wiphy, format, args...)			\
 	WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args);
 
-/**
- * cfg80211_update_owe_info_event - Notify the peer's OWE info to user space
- * @netdev: network device
- * @owe_info: peer's owe info
- * @gfp: allocation flags
- */
-void cfg80211_update_owe_info_event(struct net_device *netdev,
-				    struct cfg80211_update_owe_info *owe_info,
-				    gfp_t gfp);
-
 #endif /* __NET_CFG80211_H */
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 9ac3946a916f..0527b779f2f0 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -990,11 +990,6 @@
  *	indicated by %NL80211_ATTR_WIPHY_FREQ and other attributes
  *	determining the width and type.
  *
- * @NL80211_CMD_UPDATE_OWE_INFO: This interface allows the host driver to
- *	offload OWE processing to user space. This intends to support
- *	OWE/Enhanced Open AKM by the host drivers that implemnt SME but rely
- *	on the user space for the crypotographic/DH IE processing.
- *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -1215,7 +1210,6 @@ enum nl80211_commands {
 
 	NL80211_CMD_NOTIFY_RADAR,
 
-	NL80211_CMD_UPDATE_OWE_INFO,
 	/* add new commands above here */
 
 	/* used to define NL80211_CMD_MAX below */