[PATCH net-next] net: sched: don't break line in tc_classify loop notification

[PATCH net-next] net: sched: don't break line in tc_classify loop notification

[Daniel Borkmann]

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>
---
 net/sched/sch_api.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index a3c70a1..f43c8f3 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -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;
 	}
 
-- 
1.9.3

Re: [PATCH net-next] net: sched: don't break line in tc_classify loop notification

[Alexei Starovoitov]

On 8/28/15 9:46 AM, Daniel Borkmann wrote:
> 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>

Re: [PATCH net-next] net: sched: don't break line in tc_classify loop notification

[David Miller]

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Fri, 28 Aug 2015 18:46:39 +0200

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

Applied, thanks.