| Message ID | 1394818481-7652-4-git-send-email-kubakici@wp.pl |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2014-03-14 at 18:34 +0100, Jakub Kicinski wrote: > tx_hwtstamp_skb is always set before work is scheduled, > work is cancelled before tx_hwtstamp_skb is set to NULL. > PTP work cannot ever see tx_hwtstamp_skb set to NULL. > > Signed-off-by: Jakub Kicinski <kubakici@wp.pl> > --- > drivers/net/ethernet/intel/e1000e/netdev.c | 3 --- > 1 file changed, 3 deletions(-) Thanks Jakub, I will add this patch to my queue.
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index ccdc977..d6dd392 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -1140,9 +1140,6 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) tx_hwtstamp_work); struct e1000_hw *hw = &adapter->hw; - if (!adapter->tx_hwtstamp_skb) - return; - if (er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID) { struct skb_shared_hwtstamps shhwtstamps; u64 txstmp;
tx_hwtstamp_skb is always set before work is scheduled, work is cancelled before tx_hwtstamp_skb is set to NULL. PTP work cannot ever see tx_hwtstamp_skb set to NULL. Signed-off-by: Jakub Kicinski <kubakici@wp.pl> --- drivers/net/ethernet/intel/e1000e/netdev.c | 3 --- 1 file changed, 3 deletions(-)