diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2020-09-23 14:24:20 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-24 19:47:56 -0700 |
| commit | e2f9a8fe73d3a29edfdb4215e7596c95b6db362d (patch) | |
| tree | 2870c5b4d8eb760d52e063a138d068c3ba686ef3 /drivers/net/dsa | |
| parent | e4a85c545603227f42088e9ad71fb01f9b67d6c9 (diff) | |
| download | linux-e2f9a8fe73d3a29edfdb4215e7596c95b6db362d.tar.gz linux-e2f9a8fe73d3a29edfdb4215e7596c95b6db362d.tar.bz2 linux-e2f9a8fe73d3a29edfdb4215e7596c95b6db362d.zip | |
net: mscc: ocelot: always pass skb clone to ocelot_port_add_txtstamp_skb
Currently, ocelot switchdev passes the skb directly to the function that
enqueues it to the list of skb's awaiting a TX timestamp. Whereas the
felix DSA driver first clones the skb, then passes the clone to this
queue.
This matters because in the case of felix, the common IRQ handler, which
is ocelot_get_txtstamp(), currently clones the clone, and frees the
original clone. This is useless and can be simplified by using
skb_complete_tx_timestamp() instead of skb_tstamp_tx().
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/ocelot/felix.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index 5f395d4119ac..a56fc50f5be4 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -669,8 +669,11 @@ static bool felix_txtstamp(struct dsa_switch *ds, int port, struct ocelot *ocelot = ds->priv; struct ocelot_port *ocelot_port = ocelot->ports[port]; - if (!ocelot_port_add_txtstamp_skb(ocelot_port, clone)) + if (ocelot->ptp && (skb_shinfo(clone)->tx_flags & SKBTX_HW_TSTAMP) && + ocelot_port->ptp_cmd == IFH_REW_OP_TWO_STEP_PTP) { + ocelot_port_add_txtstamp_skb(ocelot, port, clone); return true; + } return false; } |