diff options
| author | Himadri Pandya <himadri18.07@gmail.com> | 2019-03-03 13:39:14 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-18 09:05:18 +0300 |
| commit | 5b8d98f1711edda96cf632e9bc204889dba5d307 (patch) | |
| tree | 861a49307a4b8bb307e694c569ca3d221c74c03b /drivers/staging/rtl8712/rtl871x_mlme.c | |
| parent | 0ec6fc6f453a5b139b0bfde2e737f59158eed6c3 (diff) | |
| download | linux-5b8d98f1711edda96cf632e9bc204889dba5d307.tar.xz | |
staging: rtl8712: rename bSurpriseRemoved to surprise_removed
- Rename structure field bSurprisedRemoved to surprised_removed to avoid
camelcase. Suggested by checkpatch.
- Change type to bool as the variable is used as a boolean.
Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_mlme.c')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_mlme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c index a10a5fbabb33..c666e038f43e 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.c +++ b/drivers/staging/rtl8712/rtl871x_mlme.c @@ -174,7 +174,7 @@ sint r8712_if_up(struct _adapter *padapter) { sint res; - if (padapter->driver_stopped || padapter->bSurpriseRemoved || + if (padapter->driver_stopped || padapter->surprise_removed || !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { res = false; } else { @@ -1055,7 +1055,7 @@ void _r8712_join_timeout_handler(struct _adapter *adapter) unsigned long irqL; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - if (adapter->driver_stopped || adapter->bSurpriseRemoved) + if (adapter->driver_stopped || adapter->surprise_removed) return; spin_lock_irqsave(&pmlmepriv->lock, irqL); _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); @@ -1084,7 +1084,7 @@ void r8712_scan_timeout_handler (struct _adapter *adapter) void _r8712_dhcp_timeout_handler (struct _adapter *adapter) { - if (adapter->driver_stopped || adapter->bSurpriseRemoved) + if (adapter->driver_stopped || adapter->surprise_removed) return; if (adapter->pwrctrlpriv.pwr_mode != adapter->registrypriv.power_mgnt) r8712_set_ps_mode(adapter, adapter->registrypriv.power_mgnt, |