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

Commit 6d2344ec authored by Andreas Fenkart's avatar Andreas Fenkart Committed by John W. Linville
Browse files

mwifiex: remove unused tid_tbl_lock from mwifiex_tid_tbl 



ra_list_spinlock is used to protect struct mwifiex_wmm_desc and
embedded structures such as ra_list. tid_tbl_lock while more fine
grained, is not used but in one function. That function is not
called reentrantly. To protect ra_list from concurrent modification
ra_list_spinlock must be held.

Signed-off-by: default avatarAndreas Fenkart <andreas.fenkart@streamunlimited.com>
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 ca796a31

drivers/net/wireless/mwifiex/init.c

+1 −3
Original line number Diff line number Diff line
@@ -533,10 +533,8 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter) 
		if (!adapter->priv[i])

			continue;

		priv = adapter->priv[i];

		for (j = 0; j < MAX_NUM_TID; ++j) {

		for (j = 0; j < MAX_NUM_TID; ++j)

			INIT_LIST_HEAD(&priv->wmm.tid_tbl_ptr[j].ra_list);

			spin_lock_init(&priv->wmm.tid_tbl_ptr[j].tid_tbl_lock);

		}

		INIT_LIST_HEAD(&priv->tx_ba_stream_tbl_ptr);

		INIT_LIST_HEAD(&priv->rx_reorder_tbl_ptr);

		INIT_LIST_HEAD(&priv->sta_list);

drivers/net/wireless/mwifiex/main.h

+0 −2
Original line number Diff line number Diff line
@@ -213,8 +213,6 @@ struct mwifiex_ra_list_tbl { 


struct mwifiex_tid_tbl {

	struct list_head ra_list;

	/* spin lock for tid table */

	spinlock_t tid_tbl_lock;

	struct mwifiex_ra_list_tbl *ra_list_curr;

};

drivers/net/wireless/mwifiex/wmm.c

+4 −4
Original line number Diff line number Diff line
@@ -927,12 +927,12 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter, 
				if (!tid_ptr->ra_list_curr)

					continue;



				spin_lock_irqsave(&tid_ptr->tid_tbl_lock,

						  flags);

				spin_lock_irqsave(&priv_tmp->wmm.

						  ra_list_spinlock, flags);

				is_list_empty =

					list_empty(&tid_ptr->ra_list);

				spin_unlock_irqrestore(&tid_ptr->tid_tbl_lock,

						       flags);

				spin_unlock_irqrestore(&priv_tmp->wmm.

						       ra_list_spinlock, flags);

				if (is_list_empty)

					continue;