qcacld-3.0: Add link id to tdls kernel API

Add link id param to tdls send mgmt and oper request
of kernel API.

Change-Id: I05bd2243ca00c3273b2e99c728940421d0399577
CRs-Fixed: 3439354

core/hdd/inc/wlan_hdd_tdls.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -107,14 +107,14 @@ int wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 				enum nl80211_tdls_operation oper);
 #endif
 
-#ifdef TDLS_MGMT_VERSION2
+#ifdef TDLS_MGMT_VERSION5
 int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
-				struct net_device *dev, u8 *peer,
-				u8 action_code, u8 dialog_token,
-				u16 status_code, u32 peer_capability,
-				const u8 *buf, size_t len);
-#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
+				struct net_device *dev, const uint8_t *peer,
+				uint8_t action_code, uint8_t dialog_token,
+				uint16_t status_code, uint32_t peer_capability,
+				bool initiator, const uint8_t *buf,
+				size_t len, int link_id);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
 int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				struct net_device *dev, const uint8_t *peer,
 				uint8_t action_code, uint8_t dialog_token,
@@ -127,7 +127,7 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				uint8_t action_code, uint8_t dialog_token,
 				uint16_t status_code, uint32_t peer_capability,
 				const uint8_t *buf, size_t len);
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) || defined(TDLS_MGMT_VERSION2)
 int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				struct net_device *dev, uint8_t *peer,
 				uint8_t action_code, uint8_t dialog_token,
@@ -140,7 +140,6 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				uint16_t status_code, const uint8_t *buf,
 				size_t len);
 #endif
-#endif
 
 /**
  * hdd_set_tdls_offchannel() - set tdls off-channel number

core/hdd/src/wlan_hdd_tdls.c

@@ -414,7 +414,7 @@ int wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
 	return errno;
 }
 
-#if TDLS_MGMT_VERSION2
+#ifdef TDLS_MGMT_VERSION5
 /**
  * __wlan_hdd_cfg80211_tdls_mgmt() - handle management actions on a given peer
  * @wiphy: wiphy
@@ -424,18 +424,20 @@ int wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
  * @dialog_token: dialog token
  * @status_code: status code
  * @peer_capability: peer capability
+ * @initiator: tdls initiator flag
  * @buf: additional IE to include
  * @len: length of buf in bytes
+ * @link_id: link id for mld device
  *
  * Return: 0 if success; negative errno otherwise
  */
 static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
-				struct net_device *dev, u8 *peer,
-				u8 action_code, u8 dialog_token,
-				u16 status_code, u32 peer_capability,
-				const u8 *buf, size_t len)
-#else
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
+				struct net_device *dev, const uint8_t *peer,
+				uint8_t action_code, uint8_t dialog_token,
+				uint16_t status_code, uint32_t peer_capability,
+				bool initiator, const uint8_t *buf,
+				size_t len, int link_id)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0))
 static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				struct net_device *dev, const uint8_t *peer,
 				uint8_t action_code, uint8_t dialog_token,
@@ -448,7 +450,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				uint8_t action_code, uint8_t dialog_token,
 				uint16_t status_code, uint32_t peer_capability,
 				const uint8_t *buf, size_t len)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) || defined(TDLS_MGMT_VERSION2)
 static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				struct net_device *dev, uint8_t *peer,
 				uint8_t action_code, uint8_t dialog_token,
@@ -461,7 +463,6 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				uint16_t status_code, const uint8_t *buf,
 				size_t len)
 #endif
-#endif
 {
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
@@ -514,6 +515,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 	return -EINVAL;
 }
 
+#ifdef TDLS_MGMT_VERSION5
 /**
  * wlan_hdd_cfg80211_tdls_mgmt() - cfg80211 tdls mgmt handler function
  * @wiphy: Pointer to wiphy structure.
@@ -523,8 +525,10 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
  * @dialog_token: dialog token
  * @status_code: status code
  * @peer_capability: peer capability
+ * @initiator: tdls initiator flag
  * @buf: buffer
  * @len: Length of @buf
+ * @link_id: link id for mld device
  *
  * This is the cfg80211 tdls mgmt handler function which invokes
  * the internal function @__wlan_hdd_cfg80211_tdls_mgmt with
@@ -532,15 +536,13 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
  *
  * Return: 0 for success, error number on failure.
  */
-#if TDLS_MGMT_VERSION2
 int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					struct net_device *dev,
-					u8 *peer, u8 action_code,
-					u8 dialog_token,
-					u16 status_code, u32 peer_capability,
-					const u8 *buf, size_t len)
-#else /* TDLS_MGMT_VERSION2 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)
+					const u8 *peer, u8 action_code,
+					u8 dialog_token, u16 status_code,
+					u32 peer_capability, bool initiator,
+					const u8 *buf, size_t len, int link_id)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)
 int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					struct net_device *dev,
 					const u8 *peer, u8 action_code,
@@ -554,7 +556,7 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					u8 dialog_token, u16 status_code,
 					u32 peer_capability, const u8 *buf,
 					size_t len)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) || defined(TDLS_MGMT_VERSION2)
 int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					struct net_device *dev,
 					u8 *peer, u8 action_code,
@@ -569,7 +571,6 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					u16 status_code, const u8 *buf,
 					size_t len)
 #endif
-#endif
 {
 	int errno;
 	struct osif_vdev_sync *vdev_sync;
@@ -578,12 +579,12 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 	if (errno)
 		return errno;
 
-#if TDLS_MGMT_VERSION2
+#ifdef TDLS_MGMT_VERSION5
 	errno = __wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, action_code,
 					      dialog_token, status_code,
-					      peer_capability, buf, len);
-#else /* TDLS_MGMT_VERSION2 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)
+					      peer_capability, initiator,
+					      buf, len, link_id);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) || defined(WITH_BACKPORTS)
 	errno = __wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, action_code,
 					      dialog_token, status_code,
 					      peer_capability, initiator,
@@ -592,7 +593,7 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 	errno = __wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, action_code,
 					      dialog_token, status_code,
 					      peer_capability, buf, len);
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) || defined(TDLS_MGMT_VERSION2)
 	errno = __wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, action_code,
 					      dialog_token, status_code,
 					      peer_capability, buf, len);
@@ -600,7 +601,6 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 	errno = __wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, action_code,
 					      dialog_token, status_code,
 					      buf, len);
-#endif
 #endif
 
 	osif_vdev_sync_op_stop(vdev_sync);

os_if/tdls/src/wlan_cfg80211_tdls.c

@@ -1126,6 +1126,50 @@ error:
 	return ret;
 }
 
+#ifdef TDLS_MGMT_VERSION5
+static void
+wlan_cfg80211_tdls_indicate_discovery(struct tdls_osif_indication *ind)
+{
+	struct vdev_osif_priv *osif_vdev;
+
+	osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
+
+	cfg80211_tdls_oper_request(osif_vdev->wdev->netdev,
+				   ind->peer_mac, -1,
+				   NL80211_TDLS_DISCOVERY_REQ,
+				   false, GFP_KERNEL);
+}
+
+static void
+wlan_cfg80211_tdls_indicate_setup(struct tdls_osif_indication *ind)
+{
+	struct vdev_osif_priv *osif_vdev;
+	int link_id = -1;
+
+	osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
+	if (wlan_vdev_mlme_is_mlo_vdev(ind->vdev))
+		link_id = wlan_vdev_get_link_id(ind->vdev);
+
+	osif_debug("Indication to request TDLS setup on link id %d", link_id);
+	cfg80211_tdls_oper_request(osif_vdev->wdev->netdev,
+				   ind->peer_mac, link_id,
+				   NL80211_TDLS_SETUP, false,
+				   GFP_KERNEL);
+}
+
+static void
+wlan_cfg80211_tdls_indicate_teardown(struct tdls_osif_indication *ind)
+{
+	struct vdev_osif_priv *osif_vdev;
+
+	osif_vdev = wlan_vdev_get_ospriv(ind->vdev);
+
+	osif_debug("Teardown reason %d", ind->reason);
+	cfg80211_tdls_oper_request(osif_vdev->wdev->netdev,
+				   ind->peer_mac, -1, NL80211_TDLS_TEARDOWN,
+				   ind->reason, GFP_KERNEL);
+}
+#else
 static void
 wlan_cfg80211_tdls_indicate_discovery(struct tdls_osif_indication *ind)
 {
@@ -1163,6 +1207,7 @@ wlan_cfg80211_tdls_indicate_teardown(struct tdls_osif_indication *ind)
 				   ind->peer_mac, NL80211_TDLS_TEARDOWN,
 				   ind->reason, GFP_KERNEL);
 }
+#endif
 
 void wlan_cfg80211_tdls_event_callback(void *user_data,
 				       enum tdls_event_type type,