diff options
| author | Lino Sanfilippo <LinoSanfilippo@gmx.de> | 2016-12-09 00:55:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-10 23:23:35 -0500 |
| commit | 980f140493b6d9d9e1fc67ce594170186be848a1 (patch) | |
| tree | 5a4cf0d4b4d96b42617e9a0699cdbc339b6cac0b /drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | |
| parent | c280b482662018b2178f67ea017275191c30823e (diff) | |
net: ethernet: sxgbe: 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/samsung/sxgbe/sxgbe_common.h')
| -rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h index 5cb51b609f02..c61f260e18a4 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h @@ -384,7 +384,6 @@ struct sxgbe_tx_queue { dma_addr_t *tx_skbuff_dma; struct sk_buff **tx_skbuff; struct timer_list txtimer; - spinlock_t tx_lock; /* lock for tx queues */ unsigned int cur_tx; unsigned int dirty_tx; u32 tx_count_frames; |