Commit 99a49ce6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-10-31

Please pull this small batch of spooky fixes intended for the 3.18
stream...boo!

Cyril Brulebois adds an rt2x00 device ID.

Dan Carpenter provides a one-line masking fix for an ath9k debugfs
entry.

Larry Finger gives us a package of small rtlwifi fixes which add some
bits that were left out of some feature updates that were included
in the merge window.  Hopefully this isn't a sign that the rtlwifi
base is getting too big...

Marc Yang brings a fix for a temporary mwifiex stall when doing 11n
RX reordering.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1e5c4bc4 75a916e1

drivers/net/wireless/ath/ath9k/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf, 
			 "%2d          %2x      %1x     %2x           %2x\n",

			 i, (*qcuBase & (0x7 << qcuOffset)) >> qcuOffset,

			 (*qcuBase & (0x8 << qcuOffset)) >> (qcuOffset + 3),

			 val[2] & (0x7 << (i * 3)) >> (i * 3),

			 (val[2] & (0x7 << (i * 3))) >> (i * 3),

			 (*dcuBase & (0x1f << dcuOffset)) >> dcuOffset);

	}

drivers/net/wireless/mwifiex/11n_rxreorder.c

+40 −12
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ mwifiex_del_rx_reorder_entry(struct mwifiex_private *priv, 
	mwifiex_11n_dispatch_pkt_until_start_win(priv, tbl, start_win);



	del_timer_sync(&tbl->timer_context.timer);

	tbl->timer_context.timer_is_set = false;



	spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags);

	list_del(&tbl->list);
@@ -297,6 +298,7 @@ mwifiex_flush_data(unsigned long context) 
		(struct reorder_tmr_cnxt *) context;

	int start_win, seq_num;



	ctx->timer_is_set = false;

	seq_num = mwifiex_11n_find_last_seq_num(ctx);



	if (seq_num < 0)
@@ -385,6 +387,7 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, 


	new_node->timer_context.ptr = new_node;

	new_node->timer_context.priv = priv;

	new_node->timer_context.timer_is_set = false;



	init_timer(&new_node->timer_context.timer);

	new_node->timer_context.timer.function = mwifiex_flush_data;
@@ -399,6 +402,22 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, 
	spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags);

}



static void

mwifiex_11n_rxreorder_timer_restart(struct mwifiex_rx_reorder_tbl *tbl)

{

	u32 min_flush_time;



	if (tbl->win_size >= MWIFIEX_BA_WIN_SIZE_32)

		min_flush_time = MIN_FLUSH_TIMER_15_MS;

	else

		min_flush_time = MIN_FLUSH_TIMER_MS;



	mod_timer(&tbl->timer_context.timer,

		  jiffies + msecs_to_jiffies(min_flush_time * tbl->win_size));



	tbl->timer_context.timer_is_set = true;

}



/*

 * This function prepares command for adding a BA request.

 *
@@ -523,31 +542,31 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
				u8 *ta, u8 pkt_type, void *payload)

{

	struct mwifiex_rx_reorder_tbl *tbl;

	int start_win, end_win, win_size;

	int prev_start_win, start_win, end_win, win_size;

	u16 pkt_index;

	bool init_window_shift = false;

	int ret = 0;



	tbl = mwifiex_11n_get_rx_reorder_tbl(priv, tid, ta);

	if (!tbl) {

		if (pkt_type != PKT_TYPE_BAR)

			mwifiex_11n_dispatch_pkt(priv, payload);

		return 0;

		return ret;

	}



	if ((pkt_type == PKT_TYPE_AMSDU) && !tbl->amsdu) {

		mwifiex_11n_dispatch_pkt(priv, payload);

		return 0;

		return ret;

	}



	start_win = tbl->start_win;

	prev_start_win = start_win;

	win_size = tbl->win_size;

	end_win = ((start_win + win_size) - 1) & (MAX_TID_VALUE - 1);

	if (tbl->flags & RXREOR_INIT_WINDOW_SHIFT) {

		init_window_shift = true;

		tbl->flags &= ~RXREOR_INIT_WINDOW_SHIFT;

	}

	mod_timer(&tbl->timer_context.timer,

		  jiffies + msecs_to_jiffies(MIN_FLUSH_TIMER_MS * win_size));



	if (tbl->flags & RXREOR_FORCE_NO_DROP) {

		dev_dbg(priv->adapter->dev,
@@ -568,11 +587,14 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
		if ((start_win + TWOPOW11) > (MAX_TID_VALUE - 1)) {

			if (seq_num >= ((start_win + TWOPOW11) &

					(MAX_TID_VALUE - 1)) &&

			    seq_num < start_win)

				return -1;

			    seq_num < start_win) {

				ret = -1;

				goto done;

			}

		} else if ((seq_num < start_win) ||

			   (seq_num > (start_win + TWOPOW11))) {

			return -1;

			   (seq_num >= (start_win + TWOPOW11))) {

			ret = -1;

			goto done;

		}

	}
@@ -601,8 +623,10 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
		else

			pkt_index = (seq_num+MAX_TID_VALUE) - start_win;



		if (tbl->rx_reorder_ptr[pkt_index])

			return -1;

		if (tbl->rx_reorder_ptr[pkt_index]) {

			ret = -1;

			goto done;

		}



		tbl->rx_reorder_ptr[pkt_index] = payload;

	}
@@ -613,7 +637,11 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
	 */

	mwifiex_11n_scan_and_dispatch(priv, tbl);



	return 0;

done:

	if (!tbl->timer_context.timer_is_set ||

	    prev_start_win != tbl->start_win)

		mwifiex_11n_rxreorder_timer_restart(tbl);

	return ret;

}



/*

drivers/net/wireless/mwifiex/11n_rxreorder.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#define _MWIFIEX_11N_RXREORDER_H_



#define MIN_FLUSH_TIMER_MS		50

#define MIN_FLUSH_TIMER_15_MS		15

#define MWIFIEX_BA_WIN_SIZE_32		32



#define PKT_TYPE_BAR 0xE7

#define MAX_TID_VALUE			(2 << 11)

drivers/net/wireless/mwifiex/main.h

+1 −0
Original line number Diff line number Diff line
@@ -592,6 +592,7 @@ struct reorder_tmr_cnxt { 
	struct timer_list timer;

	struct mwifiex_rx_reorder_tbl *ptr;

	struct mwifiex_private *priv;

	u8 timer_is_set;

};



struct mwifiex_rx_reorder_tbl {

drivers/net/wireless/rt2x00/rt2800usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1111,6 +1111,7 @@ static struct usb_device_id rt2800usb_device_table[] = { 
	/* Ovislink */

	{ USB_DEVICE(0x1b75, 0x3071) },

	{ USB_DEVICE(0x1b75, 0x3072) },

	{ USB_DEVICE(0x1b75, 0xa200) },

	/* Para */

	{ USB_DEVICE(0x20b8, 0x8888) },

	/* Pegatron */

CRA Git | Maintained and supported by SUSTech CRA and CCSE