Commit c1b3b199 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller

net: sched: don't break line in tc_classify loop notification

Just some minor noise follow-up to address some stylistic issues of
commit 3b3ae880 ("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: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b0fbdae1
...@@ -1825,8 +1825,7 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, ...@@ -1825,8 +1825,7 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
err = tp->classify(skb, tp, res); err = tp->classify(skb, tp, res);
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
if (unlikely(err == TC_ACT_RECLASSIFY && if (unlikely(err == TC_ACT_RECLASSIFY && !compat_mode))
!compat_mode))
goto reset; goto reset;
#endif #endif
if (err >= 0) if (err >= 0)
...@@ -1837,9 +1836,9 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp, ...@@ -1837,9 +1836,9 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
reset: reset:
if (unlikely(limit++ >= MAX_REC_LOOP)) { if (unlikely(limit++ >= MAX_REC_LOOP)) {
net_notice_ratelimited("%s: reclassify loop, rule prio %u, " net_notice_ratelimited("%s: reclassify loop, rule prio %u, protocol %02x\n",
"protocol %02x\n", tp->q->ops->id, tp->q->ops->id, tp->prio & 0xffff,
tp->prio & 0xffff, ntohs(tp->protocol)); ntohs(tp->protocol));
return TC_ACT_SHOT; return TC_ACT_SHOT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment