Commit 8e8c1bfc authored by Jakub Kicinski's avatar Jakub Kicinski

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.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 50af5969 52066149
...@@ -813,10 +813,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget) ...@@ -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; bool is_eof = tx_swbd->is_eof;
if (unlikely(tx_swbd->check_wb)) { if (unlikely(tx_swbd->check_wb)) {
struct enetc_ndev_priv *priv = netdev_priv(ndev); union enetc_tx_bd *txbd = ENETC_TXBD(*tx_ring, i);
union enetc_tx_bd *txbd;
txbd = ENETC_TXBD(*tx_ring, i);
if (txbd->flags & ENETC_TXBD_FLAGS_W && if (txbd->flags & ENETC_TXBD_FLAGS_W &&
tx_swbd->do_twostep_tstamp) { tx_swbd->do_twostep_tstamp) {
...@@ -834,8 +831,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget) ...@@ -834,8 +831,7 @@ static bool enetc_clean_tx_ring(struct enetc_bdr *tx_ring, int napi_budget)
if (xdp_frame) { if (xdp_frame) {
xdp_return_frame(xdp_frame); xdp_return_frame(xdp_frame);
} else if (skb) { } else if (skb) {
if (unlikely(tx_swbd->skb->cb[0] & if (unlikely(skb->cb[0] & ENETC_F_TX_ONESTEP_SYNC_TSTAMP)) {
ENETC_F_TX_ONESTEP_SYNC_TSTAMP)) {
/* Start work to release lock for next one-step /* Start work to release lock for next one-step
* timestamping packet. And send one skb in * timestamping packet. And send one skb in
* tx_skbs queue if has. * tx_skbs queue if has.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment