Commit e839c42d authored by Chi Pham's avatar Chi Pham Committed by Greg Kroah-Hartman

staging:rtl8187se: Removed assignments from if statements in ieee80211/ieee80211_softmac.c.

Signed-off-by: default avatarChi Pham <fempsci@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af3f31b8
...@@ -1809,7 +1809,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, ...@@ -1809,7 +1809,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED && ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED &&
ieee->iw_mode == IW_MODE_INFRA){ ieee->iw_mode == IW_MODE_INFRA){
if (0 == (errcode=assoc_parse(skb, &aid))){ errcode = assoc_parse(skb, &aid);
if (0 == errcode) {
u16 left; u16 left;
ieee->state=IEEE80211_LINKED; ieee->state=IEEE80211_LINKED;
...@@ -1900,7 +1901,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, ...@@ -1900,7 +1901,8 @@ inline int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee,
IEEE80211_DEBUG_MGMT("Received authentication response"); 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){ if(ieee->open_wep || !challenge){
ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED; ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED;
ieee->softmac_stats.rx_auth_rs_ok++; ieee->softmac_stats.rx_auth_rs_ok++;
......
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