Commit 62b1208e authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: small tx code cleanup 



It's really easier to read if it's not indented
as much, so invert the condition and rearrange
the code so the smaller chunk is indented instead.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d0b69609

net/mac80211/tx.c

+19 −19
Original line number Diff line number Diff line
@@ -317,30 +317,30 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx) 
	if (!atomic_read(&tx->sdata->bss->num_sta_ps))

		return TX_CONTINUE;



	/* buffered in hardware */

	if (!(tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)) {

		info->flags |= IEEE80211_TX_CTL_SEND_AFTER_DTIM;



		return TX_CONTINUE;

	}



	/* buffered in mac80211 */

	if (tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING) {

	if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)

		purge_old_ps_buffers(tx->local);

		if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >=

		    AP_MAX_BC_BUFFER) {



	if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >= AP_MAX_BC_BUFFER) {

#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG

			if (net_ratelimit()) {

				printk(KERN_DEBUG "%s: BC TX buffer full - "

				       "dropping the oldest frame\n",

		if (net_ratelimit())

			printk(KERN_DEBUG "%s: BC TX buffer full - dropping the oldest frame\n",

			       tx->dev->name);

			}

#endif

		dev_kfree_skb(skb_dequeue(&tx->sdata->bss->ps_bc_buf));

	} else

		tx->local->total_ps_buffered++;

		skb_queue_tail(&tx->sdata->bss->ps_bc_buf, tx->skb);

		return TX_QUEUED;

	}



	/* buffered in hardware */

	info->flags |= IEEE80211_TX_CTL_SEND_AFTER_DTIM;

	skb_queue_tail(&tx->sdata->bss->ps_bc_buf, tx->skb);



	return TX_CONTINUE;

	return TX_QUEUED;

}



static int ieee80211_use_mfp(__le16 fc, struct sta_info *sta,