diff options
author | Glen Lee <glen.lee@atmel.com> | 2015-10-27 18:28:00 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 08:11:23 +0900 |
commit | 50a0b3b7f5f8fd6a5e8163fbf6c436807085fd4a (patch) | |
tree | 8031f483242ecc691b53952bf1acabcf56374f44 /drivers/staging/wilc1000 | |
parent | d06f362cbf570efa34e8264f77428e4d3fb1c859 (diff) | |
download | blackbird-op-linux-50a0b3b7f5f8fd6a5e8163fbf6c436807085fd4a.tar.gz blackbird-op-linux-50a0b3b7f5f8fd6a5e8163fbf6c436807085fd4a.zip |
staging: wilc1000: wilc_wlan_txq_get_next: add argument wilc
This patch adds new argument struct wilc and use wilc instead of g_linux_wlan.
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
-rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index a6b966f2865e..b109289393c3 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -574,13 +574,14 @@ static struct txq_entry_t *wilc_wlan_txq_get_first(void) return tqe; } -static struct txq_entry_t *wilc_wlan_txq_get_next(struct txq_entry_t *tqe) +static struct txq_entry_t *wilc_wlan_txq_get_next(struct wilc *wilc, + struct txq_entry_t *tqe) { unsigned long flags; - spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags); + spin_lock_irqsave(&wilc->txq_spinlock, flags); tqe = tqe->next; - spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags); + spin_unlock_irqrestore(&wilc->txq_spinlock, flags); return tqe; @@ -887,7 +888,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount) i++; sum += vmm_sz; PRINT_D(TX_DBG, "sum = %d\n", sum); - tqe = wilc_wlan_txq_get_next(tqe); + tqe = wilc_wlan_txq_get_next(wilc, tqe); } else { break; } |