summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/net/cfg80211.h41
-rw-r--r--include/uapi/linux/nl80211.h6
-rw-r--r--net/wireless/nl80211.c79
-rw-r--r--net/wireless/rdev-ops.h12
-rw-r--r--net/wireless/trace.h37
5 files changed, 0 insertions, 175 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 */
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a22e64fb6d95..dfce235942a1 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -11216,34 +11216,6 @@ static int nl80211_external_auth(struct sk_buff *skb, struct genl_info *info)
return rdev_external_auth(rdev, dev, &params);
}
-static int nl80211_update_owe_info(struct sk_buff *skb, struct genl_info *info)
-{
- struct cfg80211_registered_device *rdev = info->user_ptr[0];
- struct cfg80211_update_owe_info owe_info;
- struct net_device *dev = info->user_ptr[1];
-
- if (!rdev->ops->update_owe_info)
- return -EOPNOTSUPP;
-
- if (!info->attrs[NL80211_ATTR_STATUS_CODE] ||
- (info->attrs[NL80211_ATTR_IE] &&
- !is_valid_ie_attr(info->attrs[NL80211_ATTR_IE])))
- return -EINVAL;
-
- memset(&owe_info, 0, sizeof(owe_info));
- owe_info.status =
- nla_get_u16(info->attrs[NL80211_ATTR_STATUS_CODE]);
- if (info->attrs[NL80211_ATTR_MAC])
- nla_memcpy(owe_info.bssid, info->attrs[NL80211_ATTR_MAC],
- ETH_ALEN);
- if (info->attrs[NL80211_ATTR_IE]) {
- owe_info.ie = nla_data(info->attrs[NL80211_ATTR_IE]);
- owe_info.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]);
- }
-
- return rdev_update_owe_info(rdev, dev, &owe_info);
-}
-
#define NL80211_FLAG_NEED_WIPHY 0x01
#define NL80211_FLAG_NEED_NETDEV 0x02
#define NL80211_FLAG_NEED_RTNL 0x04
@@ -12086,14 +12058,6 @@ static const struct genl_ops nl80211_ops[] = {
.internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
NL80211_FLAG_NEED_RTNL,
},
- {
- .cmd = NL80211_CMD_UPDATE_OWE_INFO,
- .doit = nl80211_update_owe_info,
- .policy = nl80211_policy,
- .flags = GENL_ADMIN_PERM,
- .internal_flags = NL80211_FLAG_NEED_NETDEV_UP |
- NL80211_FLAG_NEED_RTNL,
- },
};
/* notification functions */
@@ -14088,49 +14052,6 @@ int cfg80211_external_auth_request(struct net_device *dev,
}
EXPORT_SYMBOL(cfg80211_external_auth_request);
-void cfg80211_update_owe_info_event(struct net_device *netdev,
- struct cfg80211_update_owe_info *owe_info,
- gfp_t gfp)
-{
- struct wiphy *wiphy = netdev->ieee80211_ptr->wiphy;
- struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
- struct sk_buff *msg;
- void *hdr;
-
- trace_cfg80211_update_owe_info_event(wiphy, netdev, owe_info);
-
- if (!owe_info)
- return;
-
- msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp);
- if (!msg)
- return;
-
- hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_UPDATE_OWE_INFO);
- if (!hdr)
- goto nla_put_failure;
-
- if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||
- nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex) ||
- nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, owe_info->bssid))
- goto nla_put_failure;
-
- if (nla_put(msg, NL80211_ATTR_IE, owe_info->ie_len, owe_info->ie))
- goto nla_put_failure;
-
- genlmsg_end(msg, hdr);
-
- genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0,
- NL80211_MCGRP_MLME, gfp);
- return;
-
-nla_put_failure:
- if (hdr)
- genlmsg_cancel(msg, hdr);
- nlmsg_free(msg);
-}
-EXPORT_SYMBOL(cfg80211_update_owe_info_event);
-
/* initialisation/exit functions */
int nl80211_init(void)
diff --git a/net/wireless/rdev-ops.h b/net/wireless/rdev-ops.h
index 5cfd2634dafd..aef08a0f51f3 100644
--- a/net/wireless/rdev-ops.h
+++ b/net/wireless/rdev-ops.h
@@ -1054,16 +1054,4 @@ rdev_external_auth(struct cfg80211_registered_device *rdev,
return ret;
}
-static inline int rdev_update_owe_info(struct cfg80211_registered_device *rdev,
- struct net_device *dev,
- struct cfg80211_update_owe_info *oweinfo)
-{
- int ret;
-
- trace_rdev_update_owe_info(&rdev->wiphy, dev, oweinfo);
- ret = rdev->ops->update_owe_info(&rdev->wiphy, dev, oweinfo);
- trace_rdev_return_int(&rdev->wiphy, ret);
- return ret;
-}
-
#endif /* __CFG80211_RDEV_OPS */
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index bf43da73aad7..03a76e86793a 100644
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
@@ -2866,43 +2866,6 @@ TRACE_EVENT(cfg80211_stop_iface,
WIPHY_PR_ARG, WDEV_PR_ARG)
);
-TRACE_EVENT(rdev_update_owe_info,
- TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
- struct cfg80211_update_owe_info *owe_info),
- TP_ARGS(wiphy, netdev, owe_info),
- TP_STRUCT__entry(WIPHY_ENTRY
- NETDEV_ENTRY
- MAC_ENTRY(bssid)
- __field(u16, status)
- __dynamic_array(u8, ie, owe_info->ie_len)),
- TP_fast_assign(WIPHY_ASSIGN;
- NETDEV_ASSIGN;
- MAC_ASSIGN(bssid, owe_info->bssid);
- __entry->status = owe_info->status;
- memcpy(__get_dynamic_array(ie),
- owe_info->ie, owe_info->ie_len);),
- TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT
- " status %d", WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid),
- __entry->status)
-);
-
-TRACE_EVENT(cfg80211_update_owe_info_event,
- TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,
- struct cfg80211_update_owe_info *owe_info),
- TP_ARGS(wiphy, netdev, owe_info),
- TP_STRUCT__entry(WIPHY_ENTRY
- NETDEV_ENTRY
- MAC_ENTRY(bssid)
- __dynamic_array(u8, ie, owe_info->ie_len)),
- TP_fast_assign(WIPHY_ASSIGN;
- NETDEV_ASSIGN;
- MAC_ASSIGN(bssid, owe_info->bssid);
- memcpy(__get_dynamic_array(ie), owe_info->ie,
- owe_info->ie_len);),
- TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", peer: " MAC_PR_FMT,
- WIPHY_PR_ARG, NETDEV_PR_ARG, MAC_PR_ARG(bssid))
-);
-
#endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */
#undef TRACE_INCLUDE_PATH
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-04 16:51:27 +0000