dect
/
linux-2.6
Archived
13
0
Fork 0

Staging: rtl8187se: r8180_core.c: Cleaned up if statement

clean up the if statement's conditions to make them more
readable

fix the if statement's body indention, one tab stop to many.

Signed-off-by: Andrew Miller <amiller@amilx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrew Miller 2012-03-14 10:36:51 -04:00 committed by Greg Kroah-Hartman
parent 9948bc7e1d
commit 7c26d76be7
1 changed files with 25 additions and 21 deletions

View File

@ -1615,9 +1615,13 @@ void rtl8180_rx(struct net_device *dev)
fc = le16_to_cpu(hdr->frame_ctl);
type = WLAN_FC_GET_TYPE(fc);
if ((IEEE80211_FTYPE_CTL != type) &&
(eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
&& (!bHwError) && (!bCRC) && (!bICV)) {
if (IEEE80211_FTYPE_CTL != type &&
!bHwError && !bCRC && !bICV &&
eqMacAddr(priv->ieee80211->current_network.bssid,
fc & IEEE80211_FCTL_TODS ? hdr->addr1 :
fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 :
hdr->addr3)) {
/* Perform signal smoothing for dynamic
* mechanism on demand. This is different
* with PerformSignalSmoothing8185 in smoothing