From 09adb6e7b520991992362ccb26f92af889a117e2 Mon Sep 17 00:00:00 2001 From: Chi Pham Date: Mon, 10 Mar 2014 22:31:52 +0100 Subject: [PATCH] staging: rtl8192u: Removed assignments from if statements. Removes assignments from if statements and simplifies unnecessary 0/NULL-checking. The following coccinelle script found the match: @@ expression E0, E1, E2; statement S0; @@ - if (E0 == (E1 = E2)) + E1 = E2; + if (E1 == E0) S0 Signed-off-by: Chi Pham Acked-by: Paul E. McKenney Signed-off-by: Peter P Waskiewicz Jr --- drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | 6 ++++-- drivers/staging/rtl8192u/r8192U_core.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 662c7e41cd5c..9d4bc7b7f71f 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c @@ -1959,7 +1959,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_network network_resp; struct ieee80211_network *network = &network_resp; - if (0 == (errcode=assoc_parse(ieee,skb, &aid))){ + errcode = assoc_parse(ieee, skb, &aid); + if (!errcode) { ieee->state=IEEE80211_LINKED; ieee->assoc_id = aid; ieee->softmac_stats.rx_ass_ok++; @@ -2017,7 +2018,8 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, IEEE80211_DEBUG_MGMT("Received authentication response"); - if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){ + errcode = auth_parse(skb, &challenge, &chlen); + if (!errcode) { if(ieee->open_wep || !challenge){ ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED; ieee->softmac_stats.rx_auth_rs_ok++; diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index a56be798c164..834afca0c74b 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -1318,7 +1318,8 @@ static void rtl8192_tx_isr(struct urb *tx_urb) /* Don't send data frame during scanning.*/ if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) && (!(priv->ieee80211->queue_stop))) { - if (NULL != (skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index])))) + skb = skb_dequeue(&(priv->ieee80211->skb_waitQ[queue_index])); + if (skb) priv->ieee80211->softmac_hard_start_xmit(skb, dev); return; //modified by david to avoid further processing AMSDU -- 2.34.1