mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge "qcacld-3.0: Remove obsolete support for SIOCGIWRTS" into wlan-cld3.driver.lnx.2.0-dev
This commit is contained in:
commit
e1a5092cd9
3 changed files with 2 additions and 72 deletions
|
|
@ -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);
|
||||
|
||||
int iw_get_rts_threshold(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra);
|
||||
|
||||
extern int iw_set_essid(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra);
|
||||
|
|
|
|||
|
|
@ -5510,7 +5510,7 @@ static const iw_handler hostapd_handler[] = {
|
|||
(iw_handler) NULL, /* SIOCSIWRATE */
|
||||
(iw_handler) NULL, /* SIOCGIWRATE */
|
||||
(iw_handler) NULL, /* SIOCSIWRTS */
|
||||
(iw_handler) iw_get_rts_threshold, /* SIOCGIWRTS */
|
||||
(iw_handler) NULL, /* SIOCGIWRTS */
|
||||
(iw_handler) NULL, /* SIOCSIWFRAG */
|
||||
(iw_handler) NULL, /* SIOCGIWFRAG */
|
||||
(iw_handler) NULL, /* SIOCSIWTXPOW */
|
||||
|
|
|
|||
|
|
@ -5219,50 +5219,6 @@ static int iw_set_bitrate(struct net_device *dev,
|
|||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* __iw_get_rts_threshold() - SIOCGIWRTS ioctl handler
|
||||
* @dev: device upon which the ioctl was received
|
||||
* @info: ioctl request information
|
||||
* @wrqu: ioctl request data
|
||||
* @extra: ioctl extra data
|
||||
*
|
||||
* Return: 0 on success, non-zero on error
|
||||
*/
|
||||
static int __iw_get_rts_threshold(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra)
|
||||
{
|
||||
struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
|
||||
tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter);
|
||||
uint32_t threshold = 0;
|
||||
struct hdd_context *hdd_ctx;
|
||||
int ret;
|
||||
|
||||
ENTER_DEV(dev);
|
||||
|
||||
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
|
||||
ret = wlan_hdd_validate_context(hdd_ctx);
|
||||
if (0 != ret)
|
||||
return ret;
|
||||
|
||||
ret = hdd_check_standard_wext_control(hdd_ctx, info);
|
||||
if (0 != ret)
|
||||
return ret;
|
||||
|
||||
if (QDF_STATUS_SUCCESS !=
|
||||
sme_cfg_get_int(hal, WNI_CFG_RTS_THRESHOLD, &threshold)) {
|
||||
hdd_warn("failed to get ini parameter, WNI_CFG_RTS_THRESHOLD");
|
||||
return -EIO;
|
||||
}
|
||||
wrqu->rts.value = threshold;
|
||||
|
||||
hdd_notice("Rts-Threshold=%d!!", wrqu->rts.value);
|
||||
|
||||
EXIT();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* __iw_set_rts_threshold() - SIOCSIWRTS ioctl handler
|
||||
* @dev: device upon which the ioctl was received
|
||||
|
|
@ -5308,28 +5264,6 @@ static int __iw_set_rts_threshold(struct net_device *dev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* iw_get_rts_threshold() - SSR wrapper for __iw_get_rts_threshold()
|
||||
* @dev: pointer to net_device
|
||||
* @info: pointer to iw_request_info
|
||||
* @wrqu: pointer to iwreq_data
|
||||
* @extra: pointer to extra ioctl payload
|
||||
*
|
||||
* Return: 0 on success, error number otherwise
|
||||
*/
|
||||
int iw_get_rts_threshold(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra)
|
||||
{
|
||||
int ret;
|
||||
|
||||
cds_ssr_protect(__func__);
|
||||
ret = __iw_get_rts_threshold(dev, info, wrqu, extra);
|
||||
cds_ssr_unprotect(__func__);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* iw_set_rts_threshold() - SSR wrapper for __iw_set_rts_threshold()
|
||||
* @dev: pointer to net_device
|
||||
|
|
@ -11794,7 +11728,7 @@ static const iw_handler we_handler[] = {
|
|||
(iw_handler) iw_set_bitrate, /* SIOCSIWRATE */
|
||||
(iw_handler) iw_get_bitrate, /* SIOCGIWRATE */
|
||||
(iw_handler) iw_set_rts_threshold, /* SIOCSIWRTS */
|
||||
(iw_handler) iw_get_rts_threshold, /* SIOCGIWRTS */
|
||||
(iw_handler) NULL, /* SIOCGIWRTS */
|
||||
(iw_handler) NULL, /* SIOCSIWFRAG */
|
||||
(iw_handler) NULL, /* SIOCGIWFRAG */
|
||||
(iw_handler) NULL, /* SIOCSIWTXPOW */
|
||||
|
|
|
|||
Loading…
Reference in a new issue