diff options
| author | Lino Sanfilippo <LinoSanfilippo@gmx.de> | 2016-12-09 00:55:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-11 05:26:54 +0100 |
| commit | 739c8e149ae40a1eb044edb92a133b93b59369d8 (patch) | |
| tree | 28c1ccf8e8bd0a4a8afe6490d13fb96fac931699 /drivers/net/ethernet/stmicro/stmmac/stmmac.h | |
| parent | net: ethernet: sxgbe: remove private tx queue lock (diff) | |
| download | linux-739c8e149ae40a1eb044edb92a133b93b59369d8.tar.xz linux-739c8e149ae40a1eb044edb92a133b93b59369d8.zip | |
net: ethernet: stmmac: remove private tx queue lock
The driver uses a private lock for synchronization of the xmit function and
the xmit completion handler, but since the NETIF_F_LLTX flag is not set,
the xmit function is also called with the xmit_lock held.
On the other hand the completion handler uses the reverse locking order by
first taking the private lock and (in case that the tx queue had been
stopped) then the xmit_lock.
Improve the locking by removing the private lock and using only the
xmit_lock for synchronization instead.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac.h')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index dbacb804eb15..eab04aeeeb95 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -64,7 +64,6 @@ struct stmmac_priv { dma_addr_t dma_tx_phy; int tx_coalesce; int hwts_tx_en; - spinlock_t tx_lock; bool tx_path_in_lpi_mode; struct timer_list txtimer; bool tso; |