diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index 565284e465fb..541f5c0ce4e0 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/core/hdd/inc/wlan_hdd_tdls.h @@ -41,16 +41,6 @@ typedef int (*cfg80211_exttdls_callback)(const uint8_t *mac, int wlan_hdd_tdls_get_all_peers(struct hdd_adapter *adapter, char *buf, int buflen); -int wlan_hdd_tdls_extctrl_deconfig_peer(struct hdd_adapter *adapter, - const uint8_t *peer); -int wlan_hdd_tdls_extctrl_config_peer(struct hdd_adapter *adapter, - const uint8_t *peer, - cfg80211_exttdls_callback callback, - uint32_t chan, - uint32_t max_latency, - uint32_t op_class, - uint32_t min_bandwidth); - int wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy, struct wireless_dev *wdev, const void *data, diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 12dfc99ac06d..fe7c5b06de30 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -258,10 +258,6 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter, */ struct hdd_context *hdd_cfg80211_wiphy_alloc(void); -int wlan_hdd_cfg80211_tdls_scan(struct wiphy *wiphy, - struct cfg80211_scan_request *request, - uint8_t source); - int wlan_hdd_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request); @@ -295,10 +291,6 @@ void hdd_reg_notifier(struct wiphy *wiphy, QDF_STATUS wlan_hdd_validate_operation_channel(struct hdd_adapter *adapter, int channel); -#ifdef FEATURE_WLAN_TDLS -int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, - struct net_device *dev, u8 *peer); -#endif void hdd_select_cbmode(struct hdd_adapter *adapter, uint8_t operationChannel, struct ch_params *ch_params); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 4c8cb98e55ff..12e984b45133 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -723,31 +723,6 @@ int wlan_hdd_cfg80211_scan(struct wiphy *wiphy, return ret; } -/** - * wlan_hdd_cfg80211_tdls_scan() - API to process cfg80211 scan request - * @wiphy: Pointer to wiphy - * @request: Pointer to scan request - * @source: scan request source(NL/Vendor scan) - * - * This API responds to scan trigger and update cfg80211 scan database - * later, scan dump command can be used to receive scan results. This - * function gets called when tdls module queues the scan request. - * - * Return: 0 for success, non zero for failure. - */ -int wlan_hdd_cfg80211_tdls_scan(struct wiphy *wiphy, - struct cfg80211_scan_request *request, - uint8_t source) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __wlan_hdd_cfg80211_scan(wiphy, - request, source); - cds_ssr_unprotect(__func__); - return ret; -} - /** * wlan_hdd_get_rates() -API to get the rates from scan request * @wiphy: Pointer to wiphy diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c index 42b4711bda39..305506a84cb6 100644 --- a/core/hdd/src/wlan_hdd_tdls.c +++ b/core/hdd/src/wlan_hdd_tdls.c @@ -596,45 +596,6 @@ int wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy, return ret; } -/** - * wlan_hdd_tdls_extctrl_config_peer() - configure an externally controllable - * TDLS peer - * @adapter: HDD adapter - * @peer: MAC address of the TDLS peer - * @callback: Callback to set on the peer - * @chan: Channel - * @max_latency: Maximum latency - * @op_class: Operation class - * @min_bandwidth: Minimal bandwidth - * - * Return: 0 on success; negative otherwise - */ -int wlan_hdd_tdls_extctrl_config_peer(struct hdd_adapter *adapter, - const uint8_t *peer, - cfg80211_exttdls_callback callback, - u32 chan, - u32 max_latency, - u32 op_class, u32 min_bandwidth) -{ - /* TODO */ - return 0; -} - -/** - * wlan_hdd_tdls_extctrl_deconfig_peer() - de-configure an externally - * controllable TDLS peer - * @adapter: HDD adapter - * @peer: MAC address of the tdls peer - * - * Return: 0 if success; negative errno otherwisw - */ -int wlan_hdd_tdls_extctrl_deconfig_peer(struct hdd_adapter *adapter, - const uint8_t *peer) -{ - /* TODO */ - return 0; -} - /** * __wlan_hdd_cfg80211_tdls_oper() - helper function to handle cfg80211 operation * on an TDLS peer @@ -731,46 +692,6 @@ int wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy, return ret; } -/** - * wlan_hdd_cfg80211_send_tdls_discover_req() - send out TDLS discovery for - * a TDLS peer - * @wiphy: wiphy - * @dev: net device - * @peer: MAC address of the peer - * - * Return: 0 if success; negative errno otherwise - */ -int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, - struct net_device *dev, u8 *peer) -{ - hdd_debug("tdls send discover req: " MAC_ADDRESS_STR, - MAC_ADDR_ARRAY(peer)); -#if TDLS_MGMT_VERSION2 - return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, - WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, 0, - NULL, 0); -#else -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) - return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, - WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, - 0, 0, NULL, 0); -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) - return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, - WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, - 0, NULL, 0); -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)) - return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, - WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, - 0, NULL, 0); -#else - return wlan_hdd_cfg80211_tdls_mgmt(wiphy, dev, peer, - WLAN_TDLS_DISCOVERY_REQUEST, 1, 0, - NULL, 0); -#endif -#endif -} - - int hdd_set_tdls_offchannel(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter, int offchannel)