[Patch] net: fix build break when CONFIG_NET_CLS_ACT is not set

[Neil Horman]

Patch to fix build break that occurs when CONFIG_NET_CLS_ACT is not set.

Signed-off-by: Neil Horman <nhorman@xxxxxxxxxx>

 cls_fw.c      |    3 ++-
 cls_route.c   |    3 ++-
 cls_tcindex.c |    3 ++-
 cls_u32.c     |    2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)



--- linux-2.6-sctp/net/sched/cls_u32.c.fix	2005-03-29 15:21:04.000000000 -0500
+++ linux-2.6-sctp/net/sched/cls_u32.c	2005-03-29 14:31:34.000000000 -0500
@@ -775,9 +775,11 @@ static int u32_dump(struct tcf_proto *tp
 	}
 
 	rta->rta_len = skb->tail - b;
+#ifdef CONFIG_NET_CLS_ACT
 	if (TC_U32_KEY(n->handle) && n->exts.action && n->exts.action->type == TCA_OLD_COMPAT)
 		if (tcf_exts_dump_stats(skb, &n->exts, &u32_ext_map) < 0)
 			goto rtattr_failure;
+#endif
 	return skb->len;
 
 rtattr_failure:
--- linux-2.6-sctp/net/sched/cls_fw.c.fix	2005-03-29 14:28:29.000000000 -0500
+++ linux-2.6-sctp/net/sched/cls_fw.c	2005-03-29 14:28:43.000000000 -0500
@@ -337,10 +337,11 @@ static int fw_dump(struct tcf_proto *tp,
 		goto rtattr_failure;
 
 	rta->rta_len = skb->tail - b;
-
+#ifdef CONFIG_NET_CLS_ACT
 	if (f->exts.action && f->exts.action->type == TCA_OLD_COMPAT)
 		if (tcf_exts_dump_stats(skb, &f->exts, &fw_ext_map) < 0)
 			goto rtattr_failure;
+#endif
 
 	return skb->len;
 
--- linux-2.6-sctp/net/sched/cls_tcindex.c.fix	2005-03-29 14:30:18.000000000 -0500
+++ linux-2.6-sctp/net/sched/cls_tcindex.c	2005-03-29 14:30:44.000000000 -0500
@@ -495,10 +495,11 @@ static int tcindex_dump(struct tcf_proto
 		if (tcf_exts_dump(skb, &r->exts, &tcindex_ext_map) < 0)
 			goto rtattr_failure;
 		rta->rta_len = skb->tail-b;
-
+#ifdef CONFIG_NET_CLS_ACT
 		if (r->exts.action && r->exts.action->type == TCA_OLD_COMPAT)
 			if (tcf_exts_dump_stats(skb, &r->exts, &tcindex_ext_map) < 0)
 				goto rtattr_failure;
+#endif
 	}
 	
 	return skb->len;
--- linux-2.6-sctp/net/sched/cls_route.c.fix	2005-03-29 14:29:30.000000000 -0500
+++ linux-2.6-sctp/net/sched/cls_route.c	2005-03-29 14:29:55.000000000 -0500
@@ -598,10 +598,11 @@ static int route4_dump(struct tcf_proto 
 		goto rtattr_failure;
 
 	rta->rta_len = skb->tail - b;
-
+#ifdef CONFIG_NET_CLS_ACT
 	if (f->exts.action && f->exts.action->type == TCA_OLD_COMPAT)
 		if (tcf_exts_dump_stats(skb, &f->exts, &route_ext_map) < 0)
 			goto rtattr_failure;
+#endif
 
 	return skb->len;
 
-- 
/***************************************************
 *Neil Horman
 *Software Engineer
 *Red Hat, Inc.
 *nhorman@xxxxxxxxxx
 *gpg keyid: 1024D / 0x92A74FA1
 *http://pgp.mit.edu
 ***************************************************/

Attachment: pgp00000.pgp
Description: PGP signature