staging: rtl8712: style fix unneeded else
This patch fixes a coding style issues in the rtl8712 module as noted by checkpatch.pl where an unnecessary else is used. It fixes the following checkpatch.pl warning: WARNING: else is not generally useful after a break or return Signed-off-by: Martin Homuth <martin@martinhomuth.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>hifive-unleashed-5.1
parent
e34fc47a3f
commit
8400553b19
|
@ -55,6 +55,7 @@ static u8 do_join(struct _adapter *padapter)
|
||||||
u8 *pibss = NULL;
|
u8 *pibss = NULL;
|
||||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||||
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
struct __queue *queue = &(pmlmepriv->scanned_queue);
|
||||||
|
int ret;
|
||||||
|
|
||||||
phead = &queue->queue;
|
phead = &queue->queue;
|
||||||
plist = phead->next;
|
plist = phead->next;
|
||||||
|
@ -74,45 +75,42 @@ static u8 do_join(struct _adapter *padapter)
|
||||||
if (!pmlmepriv->sitesurveyctrl.traffic_busy)
|
if (!pmlmepriv->sitesurveyctrl.traffic_busy)
|
||||||
r8712_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid);
|
r8712_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
}
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = r8712_select_and_join_from_scan(pmlmepriv);
|
ret = r8712_select_and_join_from_scan(pmlmepriv);
|
||||||
if (ret == _SUCCESS) {
|
if (ret == _SUCCESS) {
|
||||||
mod_timer(&pmlmepriv->assoc_timer,
|
mod_timer(&pmlmepriv->assoc_timer,
|
||||||
jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
|
jiffies + msecs_to_jiffies(MAX_JOIN_TIMEOUT));
|
||||||
|
} else {
|
||||||
|
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
|
||||||
|
/* submit r8712_createbss_cmd to change to an
|
||||||
|
* ADHOC_MASTER pmlmepriv->lock has been
|
||||||
|
* acquired by caller...
|
||||||
|
*/
|
||||||
|
struct wlan_bssid_ex *pdev_network =
|
||||||
|
&(padapter->registrypriv.dev_network);
|
||||||
|
pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
|
||||||
|
pibss = padapter->registrypriv.dev_network.MacAddress;
|
||||||
|
memcpy(&pdev_network->Ssid,
|
||||||
|
&pmlmepriv->assoc_ssid,
|
||||||
|
sizeof(struct ndis_802_11_ssid));
|
||||||
|
r8712_update_registrypriv_dev_network(padapter);
|
||||||
|
r8712_generate_random_ibss(pibss);
|
||||||
|
if (r8712_createbss_cmd(padapter) != _SUCCESS)
|
||||||
|
return false;
|
||||||
|
pmlmepriv->to_join = false;
|
||||||
} else {
|
} else {
|
||||||
if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
|
/* can't associate ; reset under-linking */
|
||||||
/* submit r8712_createbss_cmd to change to an
|
if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
|
||||||
* ADHOC_MASTER pmlmepriv->lock has been
|
pmlmepriv->fw_state ^=
|
||||||
* acquired by caller...
|
_FW_UNDER_LINKING;
|
||||||
*/
|
/* when set_ssid/set_bssid for do_join(), but
|
||||||
struct wlan_bssid_ex *pdev_network =
|
* there are no desired bss in scanning queue
|
||||||
&(padapter->registrypriv.dev_network);
|
* we try to issue sitesurvey first
|
||||||
pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
|
*/
|
||||||
pibss = padapter->registrypriv.dev_network.
|
if (!pmlmepriv->sitesurveyctrl.traffic_busy)
|
||||||
MacAddress;
|
r8712_sitesurvey_cmd(padapter,
|
||||||
memcpy(&pdev_network->Ssid,
|
&pmlmepriv->assoc_ssid);
|
||||||
&pmlmepriv->assoc_ssid,
|
|
||||||
sizeof(struct ndis_802_11_ssid));
|
|
||||||
r8712_update_registrypriv_dev_network(padapter);
|
|
||||||
r8712_generate_random_ibss(pibss);
|
|
||||||
if (r8712_createbss_cmd(padapter) != _SUCCESS)
|
|
||||||
return false;
|
|
||||||
pmlmepriv->to_join = false;
|
|
||||||
} else {
|
|
||||||
/* can't associate ; reset under-linking */
|
|
||||||
if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
|
|
||||||
pmlmepriv->fw_state ^=
|
|
||||||
_FW_UNDER_LINKING;
|
|
||||||
/* when set_ssid/set_bssid for do_join(), but
|
|
||||||
* there are no desired bss in scanning queue
|
|
||||||
* we try to issue sitesurvey first
|
|
||||||
*/
|
|
||||||
if (!pmlmepriv->sitesurveyctrl.traffic_busy)
|
|
||||||
r8712_sitesurvey_cmd(padapter,
|
|
||||||
&pmlmepriv->assoc_ssid);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue