e1000e: remove redundant if clause from PTP work
authorJakub Kicinski <kubakici@wp.pl>
Sat, 15 Mar 2014 14:55:05 +0000 (14:55 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 28 Mar 2014 13:54:01 +0000 (06:54 -0700)
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>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/netdev.c

index b8d252fcad1843bf16b4208d5bf531dd173c8764..f1cce5928e201be7086fcfc6d3269a33960c5f2f 100644 (file)
@@ -1148,9 +1148,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;