Commit 546f0805 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: Move trailing conditional statement to the following line 



Coding standard requires that the conditional statement is not on the same
line as the 'if' or 'else' but on the following line. Statements moved
accordingly.

Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e824ba0

drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c

+17 −8
Original line number Diff line number Diff line
@@ -622,7 +622,8 @@ ieee80211_authentication_req(struct ieee80211_network *beacon, 
	int len = sizeof(struct ieee80211_authentication) + challengelen + ieee->tx_headroom;



	skb = dev_alloc_skb(len);

	if (!skb) return NULL;

	if (!skb)

		return NULL;



	skb_reserve(skb, ieee->tx_headroom);

	auth = skb_put(skb, sizeof(struct ieee80211_authentication));
@@ -680,7 +681,8 @@ static struct sk_buff *ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *d 
	u8 *tmp_generic_ie_buf = NULL;

	u8 tmp_generic_ie_len = 0;



	if (rate_ex_len > 0) rate_ex_len += 2;

	if (rate_ex_len > 0)

		rate_ex_len += 2;



	if (ieee->current_network.capability & WLAN_CAPABILITY_IBSS)

		atim_len = 4;
@@ -834,7 +836,8 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, 


	if (ieee->host_encrypt)

		crypt = ieee->crypt[ieee->tx_keyidx];

	else crypt = NULL;

	else

		crypt = NULL;



	encrypt = crypt && crypt->ops;
@@ -843,8 +846,10 @@ static struct sk_buff *ieee80211_assoc_resp(struct ieee80211_device *ieee, 


	assoc->status = 0;

	assoc->aid = cpu_to_le16(ieee->assoc_id);

	if (ieee->assoc_id == 0x2007) ieee->assoc_id = 0;

	else ieee->assoc_id++;

	if (ieee->assoc_id == 0x2007)

		ieee->assoc_id = 0;

	else

		ieee->assoc_id++;



	tag = skb_put(skb, rate_len);
@@ -1529,9 +1534,12 @@ static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb, 
	}



	//IEEE80211DMESG("Card MAC address is "MACSTR, MAC2STR(src));

	if (ssidlen == 0) return 1;

	if (ssidlen == 0)

		return 1;



	if (!ssid)

		return 1; /* ssid not found in tagged param */



	if (!ssid) return 1; /* ssid not found in tagged param */

	return (!strncmp(ssid, ieee->current_network.ssid, ssidlen));

}
@@ -2115,7 +2123,8 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee) 
	struct rtl_80211_hdr_3addr  *header;



	spin_lock_irqsave(&ieee->lock, flags);

	if (!ieee->queue_stop) goto exit;

	if (!ieee->queue_stop)

		goto exit;



	ieee->queue_stop = 0;