diff options
author | Jakub Kicinski <kubakici@wp.pl> | 2014-03-15 10:55:05 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-03-28 09:54:01 -0400 |
commit | 201b54b8d245ae248fabd2e62b75272da47c475b (patch) | |
tree | c64914cf9346157656fddccbc741352ac0463309 | |
parent | 59c871c5f0540c974db85eaa77f518de26940c1f (diff) |
e1000e: remove redundant if clause from PTP work
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>
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index b8d252fcad18..f1cce5928e20 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -1148,9 +1148,6 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) | |||
1148 | tx_hwtstamp_work); | 1148 | tx_hwtstamp_work); |
1149 | struct e1000_hw *hw = &adapter->hw; | 1149 | struct e1000_hw *hw = &adapter->hw; |
1150 | 1150 | ||
1151 | if (!adapter->tx_hwtstamp_skb) | ||
1152 | return; | ||
1153 | |||
1154 | if (er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID) { | 1151 | if (er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID) { |
1155 | struct skb_shared_hwtstamps shhwtstamps; | 1152 | struct skb_shared_hwtstamps shhwtstamps; |
1156 | u64 txstmp; | 1153 | u64 txstmp; |