aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/wmm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/mwifiex/wmm.c')
-rw-r--r--drivers/net/wireless/mwifiex/wmm.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 944e8846f6fc..2e8f9cdea54d 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -120,7 +120,7 @@ mwifiex_wmm_allocate_ralist_node(struct mwifiex_adapter *adapter, u8 *ra)
120 120
121 memcpy(ra_list->ra, ra, ETH_ALEN); 121 memcpy(ra_list->ra, ra, ETH_ALEN);
122 122
123 ra_list->total_pkts_size = 0; 123 ra_list->total_pkt_count = 0;
124 124
125 dev_dbg(adapter->dev, "info: allocated ra_list %p\n", ra_list); 125 dev_dbg(adapter->dev, "info: allocated ra_list %p\n", ra_list);
126 126
@@ -188,7 +188,7 @@ mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra)
188 ra_list, ra_list->is_11n_enabled); 188 ra_list, ra_list->is_11n_enabled);
189 189
190 if (ra_list->is_11n_enabled) { 190 if (ra_list->is_11n_enabled) {
191 ra_list->pkt_count = 0; 191 ra_list->ba_pkt_count = 0;
192 ra_list->ba_packet_thr = 192 ra_list->ba_packet_thr =
193 mwifiex_get_random_ba_threshold(); 193 mwifiex_get_random_ba_threshold();
194 } 194 }
@@ -679,8 +679,8 @@ mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
679 679
680 skb_queue_tail(&ra_list->skb_head, skb); 680 skb_queue_tail(&ra_list->skb_head, skb);
681 681
682 ra_list->total_pkts_size += skb->len; 682 ra_list->ba_pkt_count++;
683 ra_list->pkt_count++; 683 ra_list->total_pkt_count++;
684 684
685 if (atomic_read(&priv->wmm.highest_queued_prio) < 685 if (atomic_read(&priv->wmm.highest_queued_prio) <
686 tos_to_tid_inv[tid_down]) 686 tos_to_tid_inv[tid_down])
@@ -1037,7 +1037,7 @@ mwifiex_send_single_packet(struct mwifiex_private *priv,
1037 tx_info = MWIFIEX_SKB_TXCB(skb); 1037 tx_info = MWIFIEX_SKB_TXCB(skb);
1038 dev_dbg(adapter->dev, "data: dequeuing the packet %p %p\n", ptr, skb); 1038 dev_dbg(adapter->dev, "data: dequeuing the packet %p %p\n", ptr, skb);
1039 1039
1040 ptr->total_pkts_size -= skb->len; 1040 ptr->total_pkt_count--;
1041 1041
1042 if (!skb_queue_empty(&ptr->skb_head)) 1042 if (!skb_queue_empty(&ptr->skb_head))
1043 skb_next = skb_peek(&ptr->skb_head); 1043 skb_next = skb_peek(&ptr->skb_head);
@@ -1062,8 +1062,8 @@ mwifiex_send_single_packet(struct mwifiex_private *priv,
1062 1062
1063 skb_queue_tail(&ptr->skb_head, skb); 1063 skb_queue_tail(&ptr->skb_head, skb);
1064 1064
1065 ptr->total_pkts_size += skb->len; 1065 ptr->total_pkt_count++;
1066 ptr->pkt_count++; 1066 ptr->ba_pkt_count++;
1067 tx_info->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT; 1067 tx_info->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT;
1068 spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, 1068 spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
1069 ra_list_flags); 1069 ra_list_flags);
@@ -1224,7 +1224,7 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter)
1224 mwifiex_send_single_packet() */ 1224 mwifiex_send_single_packet() */
1225 } else { 1225 } else {
1226 if (mwifiex_is_ampdu_allowed(priv, tid) && 1226 if (mwifiex_is_ampdu_allowed(priv, tid) &&
1227 ptr->pkt_count > ptr->ba_packet_thr) { 1227 ptr->ba_pkt_count > ptr->ba_packet_thr) {
1228 if (mwifiex_space_avail_for_new_ba_stream(adapter)) { 1228 if (mwifiex_space_avail_for_new_ba_stream(adapter)) {
1229 mwifiex_create_ba_tbl(priv, ptr->ra, tid, 1229 mwifiex_create_ba_tbl(priv, ptr->ra, tid,
1230 BA_SETUP_INPROGRESS); 1230 BA_SETUP_INPROGRESS);