Merge "qcacld-3.0: Remove obsolete STA support for SIOCSIWAP" into wlan-cld3.driver.lnx.2.0-dev

This commit is contained in:
CNSS_WLAN Service 2017-10-20 00:02:48 -07:00 • committed by Gerrit - the friendly Code Review server
commit e81da9dd8e
3 changed files with 1 additions and 72 deletions

View file

@ -276,10 +276,6 @@ extern void hdd_wlan_get_stats(struct hdd_adapter *adapter, uint16_t *length,
extern void hdd_wlan_list_fw_profile(uint16_t *length,
char *buffer, uint16_t buf_len);
extern int iw_set_ap_address(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra);
extern int iw_set_var_ints_getnone(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra);

View file

@ -5295,70 +5295,3 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
return 0;
}
/**
* __iw_set_ap_address() - set ap address
* @dev: pointer to the net device
* @info: pointer to the iw request info
* @wrqu: pointer to iwreq_data
* @extra: pointer to the data
*
* This function updates the HDD global station context connection info
* BSSID with the MAC address received from the wpa_supplicant.
*
* Return: 0 on success, error number otherwise
*/
static int __iw_set_ap_address(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
struct hdd_adapter *adapter;
struct hdd_context *hdd_ctx;
struct hdd_station_ctx *sta_ctx =
WLAN_HDD_GET_STATION_CTX_PTR(WLAN_HDD_GET_PRIV_PTR(dev));
uint8_t *pMacAddress = NULL;
int ret;
ENTER_DEV(dev);
adapter = WLAN_HDD_GET_PRIV_PTR(dev);
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
ret = wlan_hdd_validate_context(hdd_ctx);
if (ret)
return ret;
ret = hdd_check_standard_wext_control(hdd_ctx, info);
if (0 != ret)
return ret;
pMacAddress = (uint8_t *) wrqu->ap_addr.sa_data;
hdd_debug(" " MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pMacAddress));
qdf_mem_copy(sta_ctx->conn_info.bssId.bytes, pMacAddress,
sizeof(struct qdf_mac_addr));
EXIT();
return 0;
}
/**
* iw_set_ap_address() - set ap addresses callback function
* @dev: Pointer to the net device.
* @info: Pointer to the iw_request_info.
* @wrqu: Pointer to the iwreq_data.
* @extra: Pointer to the data.
*
* Return: 0 for success, error number on failure.
*/
int iw_set_ap_address(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_address(dev, info, wrqu, extra);
cds_ssr_unprotect(__func__);
return ret;
}

View file

@ -11231,7 +11231,7 @@ static const iw_handler we_handler[] = {
(iw_handler) NULL, /* SIOCGIWSPY */
(iw_handler) NULL, /* SIOCSIWTHRSPY */
(iw_handler) NULL, /* SIOCGIWTHRSPY */
(iw_handler) iw_set_ap_address, /* SIOCSIWAP */
(iw_handler) NULL, /* SIOCSIWAP */
(iw_handler) NULL, /* SIOCGIWAP */
(iw_handler) NULL, /* SIOCSIWMLME */
(iw_handler) NULL, /* SIOCGIWAPLIST */