The patch titled
cls_flow: fix build error with CONFIG_NET_EMATCH=n
has been added to the -mm tree. Its filename is
net-sched-cls_flowc598-error-struct-tcf_ematch_tree-has-no-member-named-hdr.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cls_flow: fix build error with CONFIG_NET_EMATCH=n
From: Patrick McHardy <kaber@xxxxxxxxx>
Reported by Ingo Molnar:
net/sched/cls_flow.c: In function 'flow_dump':
net/sched/cls_flow.c:598: error: 'struct tcf_ematch_tree' has no member named 'hdr'
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/sched/cls_flow.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN net/sched/cls_flow.c~net-sched-cls_flowc598-error-struct-tcf_ematch_tree-has-no-member-named-hdr net/sched/cls_flow.c
--- a/net/sched/cls_flow.c~net-sched-cls_flowc598-error-struct-tcf_ematch_tree-has-no-member-named-hdr
+++ a/net/sched/cls_flow.c
@@ -595,10 +595,11 @@ static int flow_dump(struct tcf_proto *t
if (tcf_exts_dump(skb, &f->exts, &flow_ext_map) < 0)
goto nla_put_failure;
+#ifdef CONFIG_NET_EMATCH
if (f->ematches.hdr.nmatches &&
tcf_em_tree_dump(skb, &f->ematches, TCA_FLOW_EMATCHES) < 0)
goto nla_put_failure;
-
+#endif
nla_nest_end(skb, nest);
if (tcf_exts_dump_stats(skb, &f->exts, &flow_ext_map) < 0)
_
Patches currently in -mm which might be from kaber@xxxxxxxxx are
origin.patch
net-sched-cls_flowc598-error-struct-tcf_ematch_tree-has-no-member-named-hdr.patch
preemptible-rcu-sparse-annotations.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
