diff options
| author | Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-06-10 13:52:54 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-13 11:39:31 +0200 |
| commit | 6c8265009f8593eecd446f8d3e182076ede15fff (patch) | |
| tree | e9990b4eac070f63325aa506fd88328cc2d876e1 /drivers/staging/rtl8712 | |
| parent | 1f1e13017d64dc5b57eaff094da5148248cf080d (diff) | |
staging: rtl8712: Change return values of r8712_createbss_cmd()
Change return values of r8712_createbss_cmd from _SUCCESS and _FAIL to 0
and -ENOMEM respectively.
Change return type of the function from unsigned to int to reflect this.
Change call site to check for 0 instead of _SUCCESS.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_cmd.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_set.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e478c031f95f..94ff875d9025 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -409,7 +409,7 @@ void r8712_readtssi_cmdrsp_callback(struct _adapter *padapter, padapter->mppriv.workparam.bcompleted = true; } -u8 r8712_createbss_cmd(struct _adapter *padapter) +int r8712_createbss_cmd(struct _adapter *padapter) { struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -419,7 +419,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) padapter->ledpriv.LedControlHandler(padapter, LED_CTL_START_TO_LINK); pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (!pcmd) - return _FAIL; + return -ENOMEM; INIT_LIST_HEAD(&pcmd->list); pcmd->cmdcode = _CreateBss_CMD_; pcmd->parmbuf = (unsigned char *)pdev_network; @@ -431,7 +431,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) pdev_network->IELength = pdev_network->IELength; pdev_network->Ssid.SsidLength = pdev_network->Ssid.SsidLength; r8712_enqueue_cmd(pcmdpriv, pcmd); - return _SUCCESS; + return 0; } u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h index 800216cca2f6..6ea1bafd8acc 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.h +++ b/drivers/staging/rtl8712/rtl871x_cmd.h @@ -712,7 +712,7 @@ u8 r8712_setMacAddr_cmd(struct _adapter *padapter, u8 *mac_addr); u8 r8712_setassocsta_cmd(struct _adapter *padapter, u8 *mac_addr); u8 r8712_sitesurvey_cmd(struct _adapter *padapter, struct ndis_802_11_ssid *pssid); -u8 r8712_createbss_cmd(struct _adapter *padapter); +int r8712_createbss_cmd(struct _adapter *padapter); u8 r8712_setstakey_cmd(struct _adapter *padapter, u8 *psta, u8 unicast_key); u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork); diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_set.c b/drivers/staging/rtl8712/rtl871x_ioctl_set.c index 2622d5e3bff9..d0274c65d17e 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_set.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_set.c @@ -84,7 +84,7 @@ static u8 do_join(struct _adapter *padapter) sizeof(struct ndis_802_11_ssid)); r8712_update_registrypriv_dev_network(padapter); r8712_generate_random_ibss(pibss); - if (r8712_createbss_cmd(padapter) != _SUCCESS) + if (r8712_createbss_cmd(padapter)) return false; pmlmepriv->to_join = false; } else { |