UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <fempsci@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
This commit is contained in:
Chi Pham 2014-03-10 22:31:52 +01:00 committed by Peter P Waskiewicz Jr
parent 58c991d538
commit 09adb6e7b5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
View File

@ -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_resp;
struct ieee80211_network *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->state=IEEE80211_LINKED;
ieee->assoc_id = aid; ieee->assoc_id = aid;
ieee->softmac_stats.rx_ass_ok++; 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"); 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){ 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++;

3
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -1318,7 +1318,8 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
/* Don't send data frame during scanning.*/ /* Don't send data frame during scanning.*/
if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) && if ((skb_queue_len(&priv->ieee80211->skb_waitQ[queue_index]) != 0) &&
(!(priv->ieee80211->queue_stop))) { (!(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); priv->ieee80211->softmac_hard_start_xmit(skb, dev);
return; //modified by david to avoid further processing AMSDU return; //modified by david to avoid further processing AMSDU