Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/sched/sch_api.c

+4 −5
Original line number Diff line number Diff line
@@ -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)
@@ -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;

	}