summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-12-11 07:27:02 +0300
committerDavid S. Miller <davem@davemloft.net>2016-12-11 07:27:02 +0300
commit0972770eeac218cc2a55e3532d7afe114a9dd73e (patch)
tree28c1ccf8e8bd0a4a8afe6490d13fb96fac931699 /drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h
parentc280b482662018b2178f67ea017275191c30823e (diff)
parent739c8e149ae40a1eb044edb92a133b93b59369d8 (diff)
downloadlinux-0972770eeac218cc2a55e3532d7afe114a9dd73e.tar.xz
Merge branch 'sxgbe-stmmac-remove-private-tx-lock'
Lino Sanfilippo says: ==================== Remove private tx queue locks this patch series removes unnecessary private locks in the sxgbe and the stmmac driver. v2: - adjust commit message ==================== 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.h1
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;