projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'kvm-arm-for-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
net
/
sched
/
sch_drr.c
diff --git
a/net/sched/sch_drr.c
b/net/sched/sch_drr.c
index
f26bdea
..
a1cd778
100644
(file)
--- a/
net/sched/sch_drr.c
+++ b/
net/sched/sch_drr.c
@@
-403,6
+403,8
@@
static struct sk_buff *drr_dequeue(struct Qdisc *sch)
if (len <= cl->deficit) {
cl->deficit -= len;
skb = qdisc_dequeue_peeked(cl->qdisc);
+ if (unlikely(skb == NULL))
+ goto out;
if (cl->qdisc->q.qlen == 0)
list_del(&cl->alist);