diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2015-08-28 18:46:39 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-28 14:01:15 -0700 |
| commit | c1b3b19923a371c9e099c30372d376b02fe66088 (patch) | |
| tree | 54aede05c449e191a05c12b89a6f730492aabfc2 /net/sched | |
| parent | b0fbdae127a3968688ff7b474e9164dc4bf30dd5 (diff) | |
| download | op-kernel-dev-c1b3b19923a371c9e099c30372d376b02fe66088.zip op-kernel-dev-c1b3b19923a371c9e099c30372d376b02fe66088.tar.gz | |
net: sched: don't break line in tc_classify loop notification
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/sch_api.c | 9 |
1 files changed, 4 insertions, 5 deletions
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; } |
