Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / net / sched / sch_taprio.c

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 21df69071df2b1de648fdcc4ac316ec18c9b459b..660fc45ee40fc0036996f701d8c1c3184f713640 100644 (file)
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -1522,9 +1522,9 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
                goto unlock;
        }
 
-       if (TXTIME_ASSIST_IS_ENABLED(q->flags)) {
-               setup_txtime(q, new_admin, start);
+       setup_txtime(q, new_admin, start);
 
+       if (TXTIME_ASSIST_IS_ENABLED(q->flags)) {
                if (!oper) {
                        rcu_assign_pointer(q->oper_sched, new_admin);
                        err = 0;