Commit c6112046 authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Johannes Berg
Browse files

wifi: cfg80211: make TDLS management link-aware 



For multi-link operation(MLO) TDLS management
frames need to be transmitted on a specific link.
The TDLS setup request will add BSSID along with
peer address and userspace will pass the link-id
based on BSSID value to the driver(or mac80211).

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230616094948.cb3d87c22812.Ia3d15ac4a9a182145bf2d418bcb3ddf4539cd0a7@changeid


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

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+4 −4
Original line number Diff line number Diff line
@@ -3753,10 +3753,10 @@ static int mwifiex_cfg80211_set_coalesce(struct wiphy *wiphy, 
 */

static int

mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,

			   const u8 *peer, u8 action_code, u8 dialog_token,

			   u16 status_code, u32 peer_capability,

			   bool initiator, const u8 *extra_ies,

			   size_t extra_ies_len)

			   const u8 *peer, int link_id, u8 action_code,

			   u8 dialog_token, u16 status_code,

			   u32 peer_capability, bool initiator,

			   const u8 *extra_ies, size_t extra_ies_len)

{

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	int ret;

include/net/cfg80211.h

+4 −3
Original line number Diff line number Diff line
@@ -4607,9 +4607,10 @@ struct cfg80211_ops { 
				  struct cfg80211_gtk_rekey_data *data);



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

			     const u8 *peer, u8 action_code,  u8 dialog_token,

			     u16 status_code, u32 peer_capability,

			     bool initiator, const u8 *buf, size_t len);

			     const u8 *peer, int link_id,

			     u8 action_code, u8 dialog_token, u16 status_code,

			     u32 peer_capability, bool initiator,

			     const u8 *buf, size_t len);

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

			     const u8 *peer, enum nl80211_tdls_operation oper);

net/mac80211/ieee80211_i.h

+4 −4
Original line number Diff line number Diff line
@@ -2565,10 +2565,10 @@ void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local, 


/* TDLS */

int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,

			const u8 *peer, u8 action_code, u8 dialog_token,

			u16 status_code, u32 peer_capability,

			bool initiator, const u8 *extra_ies,

			size_t extra_ies_len);

			const u8 *peer, int link_id,

			u8 action_code, u8 dialog_token, u16 status_code,

			u32 peer_capability, bool initiator,

			const u8 *extra_ies, size_t extra_ies_len);

int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,

			const u8 *peer, enum nl80211_tdls_operation oper);

void ieee80211_tdls_peer_del_work(struct work_struct *wk);

net/mac80211/tdls.c

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Copyright 2014, Intel Corporation

 * Copyright 2014  Intel Mobile Communications GmbH

 * Copyright 2015 - 2016 Intel Deutschland GmbH

 * Copyright (C) 2019, 2021-2022 Intel Corporation

 * Copyright (C) 2019, 2021-2023 Intel Corporation

 */



#include <linux/ieee80211.h>
@@ -1185,10 +1185,10 @@ ieee80211_tdls_mgmt_teardown(struct wiphy *wiphy, struct net_device *dev, 
}



int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,

			const u8 *peer, u8 action_code, u8 dialog_token,

			u16 status_code, u32 peer_capability,

			bool initiator, const u8 *extra_ies,

			size_t extra_ies_len)

			const u8 *peer, int link_id,

			u8 action_code, u8 dialog_token, u16 status_code,

			u32 peer_capability, bool initiator,

			const u8 *extra_ies, size_t extra_ies_len)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	int ret;

net/wireless/nl80211.c

+5 −2
Original line number Diff line number Diff line
@@ -12262,6 +12262,7 @@ static int nl80211_tdls_mgmt(struct sk_buff *skb, struct genl_info *info) 
	u32 peer_capability = 0;

	u16 status_code;

	u8 *peer;

	int link_id;

	bool initiator;









	if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) ||








@@ -12283,8 +12284,9 @@ static int nl80211_tdls_mgmt(struct sk_buff *skb, struct genl_info *info)







	if (info->attrs[NL80211_ATTR_TDLS_PEER_CAPABILITY])









		peer_capability =









			nla_get_u32(info->attrs[NL80211_ATTR_TDLS_PEER_CAPABILITY]);









	link_id = nl80211_link_id_or_invalid(info->attrs);

















	return rdev_tdls_mgmt(rdev, dev, peer, action_code,









	return rdev_tdls_mgmt(rdev, dev, peer, link_id, action_code,









			      dialog_token, status_code, peer_capability,









			      initiator,









			      nla_data(info->attrs[NL80211_ATTR_IE]),








@@ -17151,7 +17153,8 @@ static const struct genl_small_ops nl80211_small_ops[] = {







		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,









		.doit = nl80211_tdls_mgmt,









		.flags = GENL_UNS_ADMIN_PERM,









		.internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP),









		.internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP |









					 NL80211_FLAG_MLO_VALID_LINK_ID),









	},









	{









		.cmd = NL80211_CMD_TDLS_OPER,