From 414fd67eefdd2f04a2de872d2ff077c878fea68e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 22 Sep 2017 20:10:50 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete SAP support for SIOCSIWMLME At one time the predecessor to the current driver was managed via wireless extensions, but now the driver is managed by cfg80211. The SAP implementation of SIOCSIWMLME now performs no useful actions, so remove it. Change-Id: I5da7e63d2efbc0d97dbdaec306bad2ae7a9cb0ef CRs-Fixed: 2115350 --- core/hdd/src/wlan_hdd_hostapd.c | 42 +-------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 4d8c0a08428b..730974d20150 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -4851,46 +4851,6 @@ int iw_get_wpspbc_probe_req_ies(struct net_device *dev, return ret; } -/** - * __iw_set_ap_mlme() - set ap mlme - * @dev: pointer to net_device - * @info: pointer to iw_request_info - * @wrqu; pointer to iwreq_data - * @extra: extra - * - * Return; 0 on success, error number otherwise - */ -static int __iw_set_ap_mlme(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra) -{ - ENTER_DEV(dev); - return 0; -} - -/** - * iw_set_ap_mlme() - SSR wrapper for __iw_set_ap_mlme - * @dev: pointer to net_device - * @info: pointer to iw_request_info - * @wrqu; pointer to iwreq_data - * @extra: extra - * - * Return; 0 on success, error number otherwise - */ -static int iw_set_ap_mlme(struct net_device *dev, - struct iw_request_info *info, - union iwreq_data *wrqu, - char *extra) -{ - int ret; - - cds_ssr_protect(__func__); - ret = __iw_set_ap_mlme(dev, info, wrqu, extra); - cds_ssr_unprotect(__func__); - - return ret; -} - /** * __iw_get_ap_freq() - get ap frequency * @dev - Pointer to the net device. @@ -5474,7 +5434,7 @@ static const iw_handler hostapd_handler[] = { (iw_handler) NULL, /* SIOCGIWTHRSPY */ (iw_handler) NULL, /* SIOCSIWAP */ (iw_handler) NULL, /* SIOCGIWAP */ - (iw_handler) iw_set_ap_mlme, /* SIOCSIWMLME */ + (iw_handler) NULL, /* SIOCSIWMLME */ (iw_handler) NULL, /* SIOCGIWAPLIST */ (iw_handler) NULL, /* SIOCSIWSCAN */ (iw_handler) NULL, /* SIOCGIWSCAN */