qcacld-3.0: Use new TDLS peer callback interface

Change "qcacmn: Introduce new versions of TDLS peer callbacks"
(Change-Id Id4ea23266b0f3e1480b645c5afce6c17585ccb46 in project
qca-wifi-host-cmn) introduced a new interface which removed an unused
parameter and changed obsolete naming. Update qcacld-3.0 to use this
new interface.

Change-Id: I5c4684ac0a62f314da26f92ece2c9a9874d63634
CRs-Fixed: 2200993

Kbuild

@@ -2449,6 +2449,9 @@ ifeq ($(CONFIG_DYNAMIC_DEBUG),y)
 CDEFINES += -DFEATURE_MULTICAST_HOST_FW_MSGS
 endif
 
+# Temporary until this is made the default in qca-wifi-host-cmn
+CDEFINES += -DUSE_NEW_TDLS_PEER_CALLBACKS
+
 KBUILD_CPPFLAGS += $(CDEFINES)
 
 # Currently, for versions of gcc which support it, the kernel Makefile

core/hdd/inc/wlan_hdd_tdls.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -220,12 +220,12 @@ int wlan_hdd_cfg80211_configure_tdls_mode(struct wiphy *wiphy,
 					const void *data,
 					int data_len);
 
-QDF_STATUS hdd_tdls_register_tdls_peer(void *userdata, uint32_t vdev_id,
-				       const uint8_t *mac, uint16_t sta_id,
-				       uint8_t ucastsig, uint8_t qos);
+QDF_STATUS hdd_tdls_register_peer(void *userdata, uint32_t vdev_id,
+				  const uint8_t *mac, uint16_t sta_id,
+				  uint8_t qos);
 
-QDF_STATUS hdd_tdls_deregister_tdl_peer(void *userdata,
-					uint32_t vdev_id, uint8_t sta_id);
+QDF_STATUS hdd_tdls_deregister_peer(void *userdata, uint32_t vdev_id,
+				    uint8_t sta_id);
 
 #else
 
@@ -250,18 +250,16 @@ hdd_tdls_notify_p2p_roc(struct hdd_context *hdd_ctx,
 {
 }
 
-static QDF_STATUS hdd_tdls_register_tdls_peer(void *userdata,
-					      uint32_t vdev_id,
-					      const uint8_t *mac,
-					      uint16_t sta_id,
-					      uint8_t ucastsig,
-					      uint8_t qos)
+static inline
+QDF_STATUS hdd_tdls_register_peer(void *userdata, uint32_t vdev_id,
+				  const uint8_t *mac, uint16_t sta_id,
+				  uint8_t qos);
 {
 }
 
-static QDF_STATUS hdd_tdls_deregister_tdl_peer(void *userdata,
-					       uint32_t vdev_id, uint8_t sta_id)
-
+static inline
+QDF_STATUS hdd_tdls_deregister_peer(void *userdata, uint32_t vdev_id,
+				    uint8_t sta_id)
 {
 }
 #endif /* End of FEATURE_WLAN_TDLS */

core/hdd/src/wlan_hdd_main.c

@@ -1147,9 +1147,9 @@ static int hdd_update_tdls_config(struct hdd_context *hdd_ctx)
 	tdls_cfg.tdls_update_dp_vdev_flags = CDP_UPDATE_TDLS_FLAGS;
 	tdls_cfg.tdls_event_cb = wlan_cfg80211_tdls_event_callback;
 	tdls_cfg.tdls_evt_cb_data = psoc;
-	tdls_cfg.tdls_tl_peer_data = hdd_ctx;
-	tdls_cfg.tdls_reg_tl_peer = hdd_tdls_register_tdls_peer;
-	tdls_cfg.tdls_dereg_tl_peer = hdd_tdls_deregister_tdl_peer;
+	tdls_cfg.tdls_peer_context = hdd_ctx;
+	tdls_cfg.tdls_reg_peer = hdd_tdls_register_peer;
+	tdls_cfg.tdls_dereg_peer = hdd_tdls_deregister_peer;
 	tdls_cfg.tdls_wmm_cb = hdd_wmm_is_acm_allowed;
 	tdls_cfg.tdls_wmm_cb_data = psoc;
 	tdls_cfg.tdls_rx_cb = wlan_cfg80211_tdls_rx_callback;

core/hdd/src/wlan_hdd_tdls.c

@@ -845,9 +845,9 @@ int wlan_hdd_tdls_antenna_switch(struct hdd_context *hdd_ctx,
 	return 0;
 }
 
-QDF_STATUS hdd_tdls_register_tdls_peer(void *userdata, uint32_t vdev_id,
-				       const uint8_t *mac, uint16_t sta_id,
-				       uint8_t ucastsig, uint8_t qos)
+QDF_STATUS hdd_tdls_register_peer(void *userdata, uint32_t vdev_id,
+				  const uint8_t *mac, uint16_t sta_id,
+				  uint8_t qos)
 {
 	struct hdd_adapter *adapter;
 	struct hdd_context *hddctx;
@@ -866,8 +866,8 @@ QDF_STATUS hdd_tdls_register_tdls_peer(void *userdata, uint32_t vdev_id,
 	return hdd_roam_register_tdlssta(adapter, mac, sta_id, qos);
 }
 
-QDF_STATUS hdd_tdls_deregister_tdl_peer(void *userdata,
-					uint32_t vdev_id, uint8_t sta_id)
+QDF_STATUS hdd_tdls_deregister_peer(void *userdata, uint32_t vdev_id,
+				    uint8_t sta_id)
 {
 	struct hdd_adapter *adapter;
 	struct hdd_context *hddctx;