diff options
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n_rxreorder.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/11n_rxreorder.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c index a93c03fdea82..e5dfdc39a921 100644 --- a/drivers/net/wireless/mwifiex/11n_rxreorder.c +++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c | |||
@@ -39,7 +39,7 @@ mwifiex_11n_dispatch_pkt_until_start_win(struct mwifiex_private *priv, | |||
39 | *rx_reor_tbl_ptr, int start_win) | 39 | *rx_reor_tbl_ptr, int start_win) |
40 | { | 40 | { |
41 | int no_pkt_to_send, i; | 41 | int no_pkt_to_send, i; |
42 | void *rx_tmp_ptr = NULL; | 42 | void *rx_tmp_ptr; |
43 | unsigned long flags; | 43 | unsigned long flags; |
44 | 44 | ||
45 | no_pkt_to_send = (start_win > rx_reor_tbl_ptr->start_win) ? | 45 | no_pkt_to_send = (start_win > rx_reor_tbl_ptr->start_win) ? |
@@ -88,7 +88,7 @@ mwifiex_11n_scan_and_dispatch(struct mwifiex_private *priv, | |||
88 | struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr) | 88 | struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr) |
89 | { | 89 | { |
90 | int i, j, xchg; | 90 | int i, j, xchg; |
91 | void *rx_tmp_ptr = NULL; | 91 | void *rx_tmp_ptr; |
92 | unsigned long flags; | 92 | unsigned long flags; |
93 | 93 | ||
94 | for (i = 0; i < rx_reor_tbl_ptr->win_size; ++i) { | 94 | for (i = 0; i < rx_reor_tbl_ptr->win_size; ++i) { |
@@ -335,8 +335,8 @@ int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv, | |||
335 | &cmd->params.add_ba_rsp; | 335 | &cmd->params.add_ba_rsp; |
336 | struct host_cmd_ds_11n_addba_req *cmd_addba_req = | 336 | struct host_cmd_ds_11n_addba_req *cmd_addba_req = |
337 | (struct host_cmd_ds_11n_addba_req *) data_buf; | 337 | (struct host_cmd_ds_11n_addba_req *) data_buf; |
338 | u8 tid = 0; | 338 | u8 tid; |
339 | int win_size = 0; | 339 | int win_size; |
340 | uint16_t block_ack_param_set; | 340 | uint16_t block_ack_param_set; |
341 | 341 | ||
342 | cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_RSP); | 342 | cmd->command = cpu_to_le16(HostCmd_CMD_11N_ADDBA_RSP); |
@@ -406,9 +406,8 @@ int mwifiex_11n_rx_reorder_pkt(struct mwifiex_private *priv, | |||
406 | u8 *ta, u8 pkt_type, void *payload) | 406 | u8 *ta, u8 pkt_type, void *payload) |
407 | { | 407 | { |
408 | struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr; | 408 | struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr; |
409 | int start_win, end_win, win_size; | 409 | int start_win, end_win, win_size, ret; |
410 | int ret = 0; | 410 | u16 pkt_index; |
411 | u16 pkt_index = 0; | ||
412 | 411 | ||
413 | rx_reor_tbl_ptr = | 412 | rx_reor_tbl_ptr = |
414 | mwifiex_11n_get_rx_reorder_tbl((struct mwifiex_private *) priv, | 413 | mwifiex_11n_get_rx_reorder_tbl((struct mwifiex_private *) priv, |
@@ -540,7 +539,7 @@ int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv, | |||
540 | (struct host_cmd_ds_11n_addba_rsp *) | 539 | (struct host_cmd_ds_11n_addba_rsp *) |
541 | &resp->params.add_ba_rsp; | 540 | &resp->params.add_ba_rsp; |
542 | int tid, win_size; | 541 | int tid, win_size; |
543 | struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr = NULL; | 542 | struct mwifiex_rx_reorder_tbl *rx_reor_tbl_ptr; |
544 | uint16_t block_ack_param_set; | 543 | uint16_t block_ack_param_set; |
545 | 544 | ||
546 | block_ack_param_set = le16_to_cpu(add_ba_rsp->block_ack_param_set); | 545 | block_ack_param_set = le16_to_cpu(add_ba_rsp->block_ack_param_set); |