|
@@ -5380,7 +5380,8 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
|
|
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
|
|
struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
|
|
struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
|
|
|
|
|
|
- if (!test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS,
|
|
|
|
|
|
+ if (adapter->tstamp_config.tx_type & HWTSTAMP_TX_ON &&
|
|
|
|
+ !test_and_set_bit_lock(__IGB_PTP_TX_IN_PROGRESS,
|
|
&adapter->state)) {
|
|
&adapter->state)) {
|
|
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
|
|
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
|
|
tx_flags |= IGB_TX_FLAGS_TSTAMP;
|
|
tx_flags |= IGB_TX_FLAGS_TSTAMP;
|