Skip to content

Commit

Permalink
net: sched: don't break line in tc_classify loop notification
Browse files Browse the repository at this point in the history
Just some minor noise follow-up to address some stylistic issues of
commit 3b3ae88 ("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>
  • Loading branch information
Daniel Borkmann authored and David S. Miller committed Aug 28, 2015
1 parent b0fbdae commit c1b3b19
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/sched/sch_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -1825,8 +1825,7 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,

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)
Expand All @@ -1837,9 +1836,9 @@ int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
#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;
}

Expand Down

0 comments on commit c1b3b19

Please sign in to comment.