aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lin <dlin@marvell.com>2015-11-25 11:42:41 +0800
committerDavid Lin <dlin@marvell.com>2015-11-25 11:42:41 +0800
commit6a147a2fbe07c2ac45b593d9f8227539fefb84e8 (patch)
tree65df4399346040638f9b3839f2d95aa170a67ab4
parent62d9c16f35210adbe01e3ee670123dfc1b8a2e45 (diff)
Remove Rx descriptor spin lock.
Signed-off-by: David Lin <dlin@marvell.com>
-rw-r--r--dev.h2
-rw-r--r--main.c1
-rw-r--r--rx.c4
3 files changed, 0 insertions, 7 deletions
diff --git a/dev.h b/dev.h
index fc8c200..6a95cd6 100644
--- a/dev.h
+++ b/dev.h
@@ -311,8 +311,6 @@ struct mwl_priv {
/* various descriptor data */
/* for tx descriptor data */
spinlock_t tx_desc_lock ____cacheline_aligned_in_smp;
- /* for rx descriptor data */
- spinlock_t rx_desc_lock ____cacheline_aligned_in_smp;
struct mwl_desc_data desc_data[SYSADPT_NUM_OF_DESC_DATA];
struct sk_buff_head txq[SYSADPT_NUM_OF_DESC_DATA];
struct sk_buff_head delay_q;
diff --git a/main.c b/main.c
index 4b2e44a..091b8d4 100644
--- a/main.c
+++ b/main.c
@@ -585,7 +585,6 @@ static int mwl_wl_init(struct mwl_priv *priv)
priv->qe_trigger_time = jiffies;
spin_lock_init(&priv->tx_desc_lock);
- spin_lock_init(&priv->rx_desc_lock);
spin_lock_init(&priv->fwcmd_lock);
spin_lock_init(&priv->vif_lock);
spin_lock_init(&priv->sta_lock);
diff --git a/rx.c b/rx.c
index 1795744..3dfae79 100644
--- a/rx.c
+++ b/rx.c
@@ -488,7 +488,6 @@ void mwl_rx_recv(unsigned long data)
struct ieee80211_hdr *wh;
u32 status_mask;
- spin_lock(&priv->rx_desc_lock);
desc = &priv->desc_data[0];
curr_hndl = desc->pnext_rx_hndl;
@@ -500,7 +499,6 @@ void mwl_rx_recv(unsigned long data)
priv->is_rx_schedule = false;
wiphy_warn(hw->wiphy, "busy or no receiving packets\n");
- spin_unlock(&priv->rx_desc_lock);
return;
}
@@ -625,6 +623,4 @@ out:
priv->iobase1 + MACREG_REG_A2H_INTERRUPT_STATUS_MASK);
priv->is_rx_schedule = false;
-
- spin_unlock(&priv->rx_desc_lock);
}