From: Michal Soltys <soltys@ziu.info>
Date: Thu, 30 Jun 2016 00:26:45 +0000 (+0200)
Subject: net/sched/sch_hfsc.c: add unlikely() in qdisc_peek_len()
X-Git-Tag: v4.8-rc1~140^2~217^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1d0fc5e4c6822c5dadd9389297c7c1b8eea314f;p=karo-tx-linux.git

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>
---

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;
 	}