diff options
| author | Jakub Kicinski <[email protected]> | 2014-03-15 14:55:32 +0000 |
|---|---|---|
| committer | Jeff Kirsher <[email protected]> | 2014-03-28 13:54:02 +0000 |
| commit | ed4420a3b412b09cc60d6e3d662428b7e6c36e90 (patch) | |
| tree | f7b57251f5948e2f4c1f6e9b35c2d0a77a3eae79 /drivers/net/ethernet/intel/igb/igb_main.c | |
| parent | igb: never generate both software and hardware timestamps (diff) | |
| download | kernel-ed4420a3b412b09cc60d6e3d662428b7e6c36e90.tar.gz kernel-ed4420a3b412b09cc60d6e3d662428b7e6c36e90.zip | |
igb: fix race conditions on queuing skb for HW time stamp
igb has a single set of TX time stamping resources per NIC.
Use a simple bit lock to avoid race conditions and leaking skbs
when multiple TX rings try to claim time stamping.
Signed-off-by: Jakub Kicinski <[email protected]>
Tested-by: Aaron Brown <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 1fdffa20fe97..55fc5596e2d0 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -4983,7 +4983,8 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb, if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { struct igb_adapter *adapter = netdev_priv(tx_ring->netdev); - if (!(adapter->ptp_tx_skb)) { + if (!test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS, + &adapter->state)) { skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS; tx_flags |= IGB_TX_FLAGS_TSTAMP; |