diff options
author | Daniel Borkmann <daniel@iogearbox.net> | 2015-08-28 12:46:39 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-28 17:01:15 -0400 |
commit | c1b3b19923a371c9e099c30372d376b02fe66088 (patch) | |
tree | 54aede05c449e191a05c12b89a6f730492aabfc2 /net/sched | |
parent | b0fbdae127a3968688ff7b474e9164dc4bf30dd5 (diff) |
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 a3c70a18a764..f43c8f33f09e 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -1825,8 +1825,7 @@ reclassify: | |||
1825 | 1825 | ||
1826 | err = tp->classify(skb, tp, res); | 1826 | err = tp->classify(skb, tp, res); |
1827 | #ifdef CONFIG_NET_CLS_ACT | 1827 | #ifdef CONFIG_NET_CLS_ACT |
1828 | if (unlikely(err == TC_ACT_RECLASSIFY && | 1828 | if (unlikely(err == TC_ACT_RECLASSIFY && !compat_mode)) |
1829 | !compat_mode)) | ||
1830 | goto reset; | 1829 | goto reset; |
1831 | #endif | 1830 | #endif |
1832 | if (err >= 0) | 1831 | if (err >= 0) |
@@ -1837,9 +1836,9 @@ reclassify: | |||
1837 | #ifdef CONFIG_NET_CLS_ACT | 1836 | #ifdef CONFIG_NET_CLS_ACT |
1838 | reset: | 1837 | reset: |
1839 | if (unlikely(limit++ >= MAX_REC_LOOP)) { | 1838 | if (unlikely(limit++ >= MAX_REC_LOOP)) { |
1840 | net_notice_ratelimited("%s: reclassify loop, rule prio %u, " | 1839 | net_notice_ratelimited("%s: reclassify loop, rule prio %u, protocol %02x\n", |
1841 | "protocol %02x\n", tp->q->ops->id, | 1840 | tp->q->ops->id, tp->prio & 0xffff, |
1842 | tp->prio & 0xffff, ntohs(tp->protocol)); | 1841 | ntohs(tp->protocol)); |
1843 | return TC_ACT_SHOT; | 1842 | return TC_ACT_SHOT; |
1844 | } | 1843 | } |
1845 | 1844 | ||