Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5234933 authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Do not schedule an uninitialized workqueue entry 



If a hardware Tx timestamp is requested, an uninitialized
workqueue entry may be scheduled, especially on an 82598 adapter.
Add a check for a PTP clock to avoid that. Also only apply the
unlikely to the first term of the conditional. That will make the
rest of the checks be in the cold path.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Acked-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d38e9248

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −3
Original line number Diff line number Diff line
@@ -7108,9 +7108,10 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
		tx_flags |= IXGBE_TX_FLAGS_SW_VLAN;

	}



	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&

	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&

	    adapter->ptp_clock &&

	    !test_and_set_bit_lock(__IXGBE_PTP_TX_IN_PROGRESS,

					    &adapter->state))) {

				   &adapter->state)) {

		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

		tx_flags |= IXGBE_TX_FLAGS_TSTAMP;