evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Just some minor noise follow-up to address some stylistic issues of
commit 3b3ae88026 ("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>
This commit is contained in:
Daniel Borkmann 2015-08-28 18:46:39 +02:00 • committed by David S. Miller
parent b0fbdae127
commit c1b3b19923
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/sched/sch_api.c
View file

@ -1825,8 +1825,7 @@ reclassify:
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 @@ reclassify:
#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;
} }