OSDN Git Service

staging:rtl8187se: Removed assignments from if statements in ieee80211/ieee80211_soft...
authorChi Pham <fempsci@gmail.com>
Sat, 8 Mar 2014 07:06:00 +0000 (08:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 9 Mar 2014 03:58:57 +0000 (19:58 -0800)
Signed-off-by: Chi Pham <fempsci@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c

index ab3efe9..65cdec4 100644 (file)
@@ -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++;