Commit f0cb84f8 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: rename pkt_count to ba_pkt_count in mwifiex_ra_list_tbl struct 



pkt_count is used to determine if BA can be formed on this RA list
by comparing it with randomly generated BA threshold. The pkt_count
variable name here is ambiguous and does not reflect its usage
correctly. Rename it to ba_pkt_count.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e15370d

drivers/net/wireless/mwifiex/main.h

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ struct mwifiex_ra_list_tbl { 
	u32 total_pkts_size;

	u32 is_11n_enabled;

	u16 max_amsdu;

	u16 pkt_count;

	u16 ba_pkt_count;

	u8 ba_packet_thr;

};

drivers/net/wireless/mwifiex/wmm.c

+4 −4
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ mwifiex_ralist_add(struct mwifiex_private *priv, u8 *ra) 
			ra_list, ra_list->is_11n_enabled);



		if (ra_list->is_11n_enabled) {

			ra_list->pkt_count = 0;

			ra_list->ba_pkt_count = 0;

			ra_list->ba_packet_thr =

					      mwifiex_get_random_ba_threshold();

		}
@@ -680,7 +680,7 @@ mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv, 
	skb_queue_tail(&ra_list->skb_head, skb);



	ra_list->total_pkts_size += skb->len;

	ra_list->pkt_count++;

	ra_list->ba_pkt_count++;



	if (atomic_read(&priv->wmm.highest_queued_prio) <

						tos_to_tid_inv[tid_down])
@@ -1063,7 +1063,7 @@ mwifiex_send_single_packet(struct mwifiex_private *priv, 
		skb_queue_tail(&ptr->skb_head, skb);



		ptr->total_pkts_size += skb->len;

		ptr->pkt_count++;

		ptr->ba_pkt_count++;

		tx_info->flags |= MWIFIEX_BUF_FLAG_REQUEUED_PKT;

		spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,

				       ra_list_flags);
@@ -1224,7 +1224,7 @@ mwifiex_dequeue_tx_packet(struct mwifiex_adapter *adapter) 
		   mwifiex_send_single_packet() */

	} else {

		if (mwifiex_is_ampdu_allowed(priv, tid) &&

		    ptr->pkt_count > ptr->ba_packet_thr) {

		    ptr->ba_pkt_count > ptr->ba_packet_thr) {

			if (mwifiex_space_avail_for_new_ba_stream(adapter)) {

				mwifiex_create_ba_tbl(priv, ptr->ra, tid,

						      BA_SETUP_INPROGRESS);

CRA Git | Maintained and supported by SUSTech CRA and CCSE