diff options
| author |   Florian Westphal <fw@strlen.de> | 2016-04-24 21:38:10 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-04-26 15:53:04 -0400 |
| commit | 353e3bd5a7081f23a9f015cbf172ec25b1412b93 (patch) | |
| tree | 33943c79cbbc089db059a0e07699507e0339333c /drivers/net/ethernet/atheros/atl1c/atl1c.h | |
| parent | RDMA/nes: remove use of NETDEV_TX_LOCKED (diff) | |
| download | linux-dev-353e3bd5a7081f23a9f015cbf172ec25b1412b93.tar.xz linux-dev-353e3bd5a7081f23a9f015cbf172ec25b1412b93.zip | |
atl1c: remove private tx lock
AFAICS this is safe: the lock is only used in the .ndo_start_xmit
function and this driver does not set LLTX.
Gets rid of TX_LOCKED return value, followup patches will remove it.
Cc: Jay Cliburn <jcliburn@gmail.com>
Cc: Chris Snook <chris.snook@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/atl1c/atl1c.h')
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h index b9203d928938..c46b489ce9b4 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c.h +++ b/drivers/net/ethernet/atheros/atl1c/atl1c.h @@ -488,7 +488,7 @@ struct atl1c_tpd_ring { dma_addr_t dma; /* descriptor ring physical address */ u16 size; /* descriptor ring length in bytes */ u16 count; /* number of descriptors in the ring */ - u16 next_to_use; /* this is protectd by adapter->tx_lock */ + u16 next_to_use; atomic_t next_to_clean; struct atl1c_buffer *buffer_info; }; @@ -542,7 +542,6 @@ struct atl1c_adapter { u16 link_duplex; spinlock_t mdio_lock; - spinlock_t tx_lock; atomic_t irq_sem; struct work_struct common_task; |