Skip to content

Commit bfabd41

Browse files
vcgomesdavem330
authored andcommitted
taprio: Fix dropping packets when using taprio + ETF offloading
When using taprio offloading together with ETF offloading, configured like this, for example: $ tc qdisc replace dev $IFACE parent root handle 100 taprio \ num_tc 4 \ map 2 2 1 0 3 2 2 2 2 2 2 2 2 2 2 2 \ queues 1@0 1@1 1@2 1@3 \ base-time $BASE_TIME \ sched-entry S 01 1000000 \ sched-entry S 0e 1000000 \ flags 0x2 $ tc qdisc replace dev $IFACE parent 100:1 etf \ offload delta 300000 clockid CLOCK_TAI During enqueue, it works out that the verification added for the "txtime" assisted mode is run when using taprio + ETF offloading, the only thing missing is initializing the 'next_txtime' of all the cycle entries. (if we don't set 'next_txtime' all packets from SO_TXTIME sockets are dropped) Fixes: 4cfd577 ("taprio: Add support for txtime-assist mode") Signed-off-by: Vinicius Costa Gomes <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7c16680 commit bfabd41

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/sched/sch_taprio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,9 +1522,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
15221522
goto unlock;
15231523
}
15241524

1525-
if (TXTIME_ASSIST_IS_ENABLED(q->flags)) {
1526-
setup_txtime(q, new_admin, start);
1525+
setup_txtime(q, new_admin, start);
15271526

1527+
if (TXTIME_ASSIST_IS_ENABLED(q->flags)) {
15281528
if (!oper) {
15291529
rcu_assign_pointer(q->oper_sched, new_admin);
15301530
err = 0;

0 commit comments

Comments
 (0)