diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 16:42:59 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-07-20 16:42:59 +0900 |
| commit | 9ff561fdf73493d757bbc74aa58627e1381650fb (patch) | |
| tree | 4484d230662126b1ac94ea545ca5429c91e0a68b /drivers/net/wireless/mwifiex/wmm.c | |
| parent | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (diff) | |
| parent | fdd85ec3eb8cc1b663678a3efa16ee59a32e0277 (diff) | |
Merge branch 'common/pinctrl' into sh-latest
Diffstat (limited to 'drivers/net/wireless/mwifiex/wmm.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/wmm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c index f3fc6551585..3fa4d417699 100644 --- a/drivers/net/wireless/mwifiex/wmm.c +++ b/drivers/net/wireless/mwifiex/wmm.c @@ -404,6 +404,8 @@ mwifiex_wmm_init(struct mwifiex_adapter *adapter) priv->add_ba_param.tx_win_size = MWIFIEX_AMPDU_DEF_TXWINSIZE; priv->add_ba_param.rx_win_size = MWIFIEX_AMPDU_DEF_RXWINSIZE; + mwifiex_reset_11n_rx_seq_num(priv); + atomic_set(&priv->wmm.tx_pkts_queued, 0); atomic_set(&priv->wmm.highest_queued_prio, HIGH_PRIO_TID); } @@ -1221,6 +1223,7 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter) if (!ptr->is_11n_enabled || mwifiex_is_ba_stream_setup(priv, ptr, tid) || + priv->wps.session_enable || ((priv->sec_info.wpa_enabled || priv->sec_info.wpa2_enabled) && !priv->wpa_is_gtk_set)) { |