Commit 09adb6e7 authored by Chi Pham's avatar Chi Pham Committed by Peter P Waskiewicz Jr
Browse files

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: default avatarChi Pham <fempsci@gmail.com>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent 58c991d5

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c

+4 −2
Original line number Diff line number Diff line
@@ -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++;

drivers/staging/rtl8192u/r8192U_core.c

+2 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE