Commit 8b3d9cde authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: rtw_mlme.c: Remove some tab and parenthesis abuse

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d54239a4
...@@ -369,11 +369,10 @@ int is_same_network23a(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst) ...@@ -369,11 +369,10 @@ int is_same_network23a(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)
return ((src->Ssid.ssid_len == dst->Ssid.ssid_len) && return ((src->Ssid.ssid_len == dst->Ssid.ssid_len) &&
/* (src->DSConfig == dst->DSConfig) && */ /* (src->DSConfig == dst->DSConfig) && */
ether_addr_equal(src->MacAddress, dst->MacAddress) && ether_addr_equal(src->MacAddress, dst->MacAddress) &&
((!memcmp(src->Ssid.ssid, dst->Ssid.ssid, src->Ssid.ssid_len))) && !memcmp(src->Ssid.ssid, dst->Ssid.ssid, src->Ssid.ssid_len) &&
((s_cap & WLAN_CAPABILITY_IBSS) == (s_cap & WLAN_CAPABILITY_IBSS) ==
(d_cap & WLAN_CAPABILITY_IBSS)) && (d_cap & WLAN_CAPABILITY_IBSS) &&
((s_cap & WLAN_CAPABILITY_ESS) == (s_cap & WLAN_CAPABILITY_ESS) == (d_cap & WLAN_CAPABILITY_ESS));
(d_cap & WLAN_CAPABILITY_ESS)));
} }
struct wlan_network * struct wlan_network *
...@@ -611,8 +610,7 @@ static int rtw_is_desired_network(struct rtw_adapter *adapter, ...@@ -611,8 +610,7 @@ static int rtw_is_desired_network(struct rtw_adapter *adapter,
bselected = false; bselected = false;
} }
if (desired_encmode != Ndis802_11EncryptionDisabled && if (desired_encmode != Ndis802_11EncryptionDisabled && privacy == 0) {
privacy == 0) {
DBG_8723A("desired_encmode: %d, privacy: %d\n", DBG_8723A("desired_encmode: %d, privacy: %d\n",
desired_encmode, privacy); desired_encmode, privacy);
bselected = false; bselected = false;
...@@ -1543,7 +1541,7 @@ void rtw23a_join_to_handler (unsigned long data) ...@@ -1543,7 +1541,7 @@ void rtw23a_join_to_handler (unsigned long data)
DBG_8723A("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv)); DBG_8723A("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
if (adapter->bDriverStopped ||adapter->bSurpriseRemoved) if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
return; return;
spin_lock_bh(&pmlmepriv->lock); spin_lock_bh(&pmlmepriv->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment