diff options
| author |   Jakub Kicinski <kubakici@wp.pl> | 2014-03-15 14:55:11 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-03-31 15:48:00 -0700 |
| commit | 181e7d5d7bd7747e882e3ca89ecbf0fc3e72d0da (patch) | |
| tree | 31e0de252a598b8b77e66543d4e7eb50a4f8be53 /drivers/net/ethernet | |
| parent | e1000e: Fix no connectivity when driver loaded with cable out (diff) | |
| download | linux-dev-181e7d5d7bd7747e882e3ca89ecbf0fc3e72d0da.tar.xz linux-dev-181e7d5d7bd7747e882e3ca89ecbf0fc3e72d0da.zip | |
ixgbe: remove redundant if clause from PTP work
ptp_tx_skb is always set before work is scheduled,
work is cancelled before ptp_tx_skb is set to NULL.
PTP work cannot ever see ptp_tx_skb set to NULL.
Signed-off-by: Jakub Kicinski <kubakici@wp.pl>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 44ac9aef6a8d..8b527d79d429 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c @@ -512,10 +512,6 @@ static void ixgbe_ptp_tx_hwtstamp_work(struct work_struct *work) IXGBE_PTP_TX_TIMEOUT); u32 tsynctxctl; - /* we have to have a valid skb */ - if (!adapter->ptp_tx_skb) - return; - if (timeout) { dev_kfree_skb_any(adapter->ptp_tx_skb); adapter->ptp_tx_skb = NULL; |