UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: sched: taprio: Remove should_restart_cycle() 

The 'entry' argument from should_restart_cycle() cannot be NULL since it
is already checked by the caller so the WARN_ON() within should_
restart_cycle() could be removed.  By doing that, that function becomes
a dummy wrapper on list_is_last() so this patch simply gets rid of it
and call list_is_last() within advance_sched() instead.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andre Guedes 2019-04-23 12:44:22 -07:00 committed by David S. Miller
parent 8599099f0c
commit 5175aafe71
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sched/sch_taprio.c
View File

@ -209,14 +209,6 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
return NULL; return NULL;
} }
static bool should_restart_cycle(const struct taprio_sched *q,
const struct sched_entry *entry)
{
WARN_ON(!entry);
return list_is_last(&entry->list, &q->entries);
}
static enum hrtimer_restart advance_sched(struct hrtimer *timer) static enum hrtimer_restart advance_sched(struct hrtimer *timer)
{ {
struct taprio_sched *q = container_of(timer, struct taprio_sched, struct taprio_sched *q = container_of(timer, struct taprio_sched,
@ -240,7 +232,7 @@ static enum hrtimer_restart advance_sched(struct hrtimer *timer)
goto first_run; goto first_run;
} }
if (should_restart_cycle(q, entry)) if (list_is_last(&entry->list, &q->entries))
next = list_first_entry(&q->entries, struct sched_entry, next = list_first_entry(&q->entries, struct sched_entry,
list); list);
else else