net: sched: don't break line in tc_classify loop notification
authorDaniel Borkmann <daniel@iogearbox.net>
Fri, 28 Aug 2015 16:46:39 +0000 (18:46 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 21:01:15 +0000 (14:01 -0700)
Just some minor noise follow-up to address some stylistic issues of
commit 3b3ae880266d ("net: sched: consolidate tc_classify{,_compat}").
Accidentally v1 instead of v2 of that commit got applied, so this
patch adds the relative diff.

Suggested-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_api.c

index a3c70a18a7647eaf694ce1a064f56d935ac87309..f43c8f33f09ef60e0f2a49ffd62f03624798c61b 100644 (file)
@@ -1825,8 +1825,7 @@ reclassify:
 
                err = tp->classify(skb, tp, res);
 #ifdef CONFIG_NET_CLS_ACT
-               if (unlikely(err == TC_ACT_RECLASSIFY &&
-                            !compat_mode))
+               if (unlikely(err == TC_ACT_RECLASSIFY && !compat_mode))
                        goto reset;
 #endif
                if (err >= 0)
@@ -1837,9 +1836,9 @@ reclassify:
 #ifdef CONFIG_NET_CLS_ACT
 reset:
        if (unlikely(limit++ >= MAX_REC_LOOP)) {
-               net_notice_ratelimited("%s: reclassify loop, rule prio %u, "
-                                      "protocol %02x\n", tp->q->ops->id,
-                                      tp->prio & 0xffff, ntohs(tp->protocol));
+               net_notice_ratelimited("%s: reclassify loop, rule prio %u, protocol %02x\n",
+                                      tp->q->ops->id, tp->prio & 0xffff,
+                                      ntohs(tp->protocol));
                return TC_ACT_SHOT;
        }