diff options
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index cd20409858d1..1fdffa20fe97 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -4980,8 +4980,6 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb, | |||
4980 | first->bytecount = skb->len; | 4980 | first->bytecount = skb->len; |
4981 | first->gso_segs = 1; | 4981 | first->gso_segs = 1; |
4982 | 4982 | ||
4983 | skb_tx_timestamp(skb); | ||
4984 | |||
4985 | if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { | 4983 | if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { |
4986 | struct igb_adapter *adapter = netdev_priv(tx_ring->netdev); | 4984 | struct igb_adapter *adapter = netdev_priv(tx_ring->netdev); |
4987 | 4985 | ||
@@ -4996,6 +4994,8 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb, | |||
4996 | } | 4994 | } |
4997 | } | 4995 | } |
4998 | 4996 | ||
4997 | skb_tx_timestamp(skb); | ||
4998 | |||
4999 | if (vlan_tx_tag_present(skb)) { | 4999 | if (vlan_tx_tag_present(skb)) { |
5000 | tx_flags |= IGB_TX_FLAGS_VLAN; | 5000 | tx_flags |= IGB_TX_FLAGS_VLAN; |
5001 | tx_flags |= (vlan_tx_tag_get(skb) << IGB_TX_FLAGS_VLAN_SHIFT); | 5001 | tx_flags |= (vlan_tx_tag_get(skb) << IGB_TX_FLAGS_VLAN_SHIFT); |