| Message ID | 4b24d2566b1877613540f277e60673c817b71842.1440780286.git.daniel@iogearbox.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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(-)