diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-21 15:36:00 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-21 15:36:01 -0700 |
| commit | 8e8c1bfce3026f93c796e396ad8f063275fd24ef (patch) | |
| tree | ea4a4640f3a375748fcce9821ba4b06fd7e236d5 | |
| parent | net/core: Remove unused assignment operations and variable (diff) | |
| parent | net: enetc: use the skb variable directly in enetc_clean_tx_ring() (diff) | |
| download | linux-dev-8e8c1bfce3026f93c796e396ad8f063275fd24ef.tar.xz linux-dev-8e8c1bfce3026f93c796e396ad8f063275fd24ef.zip | |
Merge branch 'enetc-trivial-ptp-one-step-tx-timestamping-cleanups'
Vladimir Oltean says:
====================
enetc: trivial PTP one-step TX timestamping cleanups
These are two cleanup patches for some inconsistencies
I noticed in the driver's TX ring cleanup function.
====================
Link: https://lore.kernel.org/r/20211020174220.1093032-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ethernet/freescale/enetc/enetc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 8e31fe15bf3c..504e12554079 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -813,10 +813,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget) bool is_eof = tx_swbd->is_eof; if (unlikely(tx_swbd->check_wb)) { - struct enetc_ndev_priv *priv = netdev_priv(ndev); - union enetc_tx_bd *txbd; - - txbd = ENETC_TXBD(*tx_ring, i); + union enetc_tx_bd *txbd = ENETC_TXBD(*tx_ring, i); if (txbd->flags & ENETC_TXBD_FLAGS_W && tx_swbd->do_twostep_tstamp) { @@ -834,8 +831,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget) if (xdp_frame) { xdp_return_frame(xdp_frame); } else if (skb) { - if (unlikely(tx_swbd->skb->cb[0] & - ENETC_F_TX_ONESTEP_SYNC_TSTAMP)) { + if (unlikely(skb->cb[0] & ENETC_F_TX_ONESTEP_SYNC_TSTAMP)) { /* Start work to release lock for next one-step * timestamping packet. And send one skb in * tx_skbs queue if has. |