Commit:     0aead543479e7f20013217fe3fc33a604fdd8944
Parent:     cc8274f50f2ad9a97a837451f63a0a3e65f7f490
Author:     Rami Rosen <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 5 02:56:48 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Feb 5 02:56:48 2008 -0800

    [NET_SCHED]: Add #ifdef CONFIG_NET_EMATCH in net/sched/cls_flow.c (latest 
git broken build)
    The 2.6 latest git build was broken when using the following
    configuration options:
    with the following error:
    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'
    make[2]: *** [net/sched/cls_flow.o] Error 1
    make[1]: *** [net/sched] Error 2
    make: *** [net] Error 2
    see the recent post by Li Zefan:
    The reason for this crash is that struct tcf_ematch_tree
    (net/pkt_cls.h) is empty when CONFIG_NET_EMATCH is not defined.
    When CONFIG_NET_EMATCH is defined, the tcf_ematch_tree structure
    indeed holds a struct tcf_ematch_tree_hdr (hdr) as flow_dump()
    This patch adds #ifdef CONFIG_NET_EMATCH in flow_dump to avoid this.
    Signed-off-by: Rami Rosen <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/sched/cls_flow.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 5a7f6a3..8d76986 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -594,11 +594,11 @@ static int flow_dump(struct tcf_proto *tp, unsigned long 
        if (tcf_exts_dump(skb, &f->exts, &flow_ext_map) < 0)
                goto nla_put_failure;
        if (f->ematches.hdr.nmatches &&
            tcf_em_tree_dump(skb, &f->ematches, TCA_FLOW_EMATCHES) < 0)
                goto nla_put_failure;
        nla_nest_end(skb, nest);
        if (tcf_exts_dump_stats(skb, &f->exts, &flow_ext_map) < 0)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to