Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab581472 authored by Yogesh Ashok Powar's avatar Yogesh Ashok Powar Committed by John W. Linville
Browse files

mwifiex: change return types to void 



Functions mwifiex_11n_dispatch_pkt_until_start_win and
mwifiex_11n_scan_and_dispatch used to always return value
zero for all inputs. Changing these functions to void.

Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent eedf15d3

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

+6 −12
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
 * Since the buffer is linear, the function uses rotation to simulate

 * circular buffer.

 */

static int

static void

mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv,

					 struct mwifiex_rx_reorder_tbl

					 *rx_reor_tbl_ptr, int start_win)
@@ -71,8 +71,6 @@ mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv, 


	rx_reor_tbl_ptr->start_win = start_win;

	spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);



	return 0;

}



/*
@@ -83,7 +81,7 @@ mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv, 
 * Since the buffer is linear, the function uses rotation to simulate

 * circular buffer.

 */

static int

static void

mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv,

			      struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr)

{
@@ -119,7 +117,6 @@ mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv, 
	rx_reor_tbl_ptr->start_win = (rx_reor_tbl_ptr->start_win + i)

		&(MAX_TID_VALUE - 1);

	spin_unlock_irqrestore(&priv->rx_pkt_lock, flags);

	return 0;

}



/*
@@ -405,7 +402,7 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
				u8 *ta, u8 pkt_type, void *payload)

{

	struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr;

	int start_win, end_win, win_size, ret;

	int start_win, end_win, win_size;

	u16 pkt_index;



	rx_reor_tbl_ptr =
@@ -452,11 +449,8 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
			start_win = (end_win - win_size) + 1;

		else

			start_win = (MAX_TID_VALUE - (win_size - seq_num)) + 1;

		ret = mwifiex_11n_dispatch_pkt_until_start_win(priv,

		mwifiex_11n_dispatch_pkt_until_start_win(priv,

						rx_reor_tbl_ptr, start_win);



		if (ret)

			return ret;

	}



	if (pkt_type != PKT_TYPE_BAR) {
@@ -475,9 +469,9 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, 
	 * Dispatch all packets sequentially from start_win until a

	 * hole is found and adjust the start_win appropriately

	 */

	ret = mwifiex_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr);

	mwifiex_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr);



	return ret;

	return 0;

}



/*