aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2016-06-30 02:26:45 +0200
committerDavid S. Miller <davem@davemloft.net>2016-07-01 05:03:43 -0400
commitd1d0fc5e4c6822c5dadd9389297c7c1b8eea314f (patch)
treef6570fd55386fa2e04884efdc906c9a5c7038b8d
parentnet/sched/sch_hfsc.c: handle corner cases where head may change invalidating calculated deadline (diff)
downloadlinux-dev-d1d0fc5e4c6822c5dadd9389297c7c1b8eea314f.tar.xz
linux-dev-d1d0fc5e4c6822c5dadd9389297c7c1b8eea314f.zip
net/sched/sch_hfsc.c: add unlikely() in qdisc_peek_len()
The condition can only succeed on wrong configurations. Signed-off-by: Michal Soltys <soltys@ziu.info> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_hfsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c
index 6d6df6b2d38f..e2244bb78130 100644
--- a/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@ -882,7 +882,7 @@ qdisc_peek_len(struct Qdisc *sch)
unsigned int len;
skb = sch->ops->peek(sch);
- if (skb == NULL) {
+ if (unlikely(skb == NULL)) {
qdisc_warn_nonwc("qdisc_peek_len", sch);
return 0;
}