summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChi Pham <fempsci@gmail.com>2014-03-08 08:06:00 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-08 19:58:57 -0800
commite839c42d0b8789edc9814b69dcbedd3e1ad7c544 (patch)
treedf7dbdab176e0e543877421f6c6ad332b40eb8de
parentaf3f31b8161964c585ac2080f9e07488ab7a3e87 (diff)
staging:rtl8187se: Removed assignments from if statements in ieee80211/ieee80211_softmac.c.
Signed-off-by: Chi Pham <fempsci@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index ab3efe910e9..65cdec4419d 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -1809,7 +1809,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED &&
ieee->iw_mode == IW_MODE_INFRA){
- if (0 == (errcode=assoc_parse(skb, &aid))){
+ errcode = assoc_parse(skb, &aid);
+ if (0 == errcode) {
u16 left;
ieee->state=IEEE80211_LINKED;
@@ -1900,7 +1901,8 @@ associate_complete:
IEEE80211_DEBUG_MGMT("Received authentication response");
- if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){
+ errcode = auth_parse(skb, &challenge, &chlen);
+ if (0 == errcode) {
if(ieee->open_wep || !challenge){
ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED;
ieee->softmac_stats.rx_auth_rs_ok++;