1 files changed, 37 insertions, 59 deletions

diff --git a/lib/route/sch/red.c b/lib/route/sch/red.c
index 727db17..5df3f3c 100644
--- a/lib/route/sch/red.c
+++ b/lib/route/sch/red.c
@@ -6,12 +6,12 @@
  *	License as published by the Free Software Foundation version 2.1
  *	of the License.
  *
- * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2011 Thomas Graf <tgraf@suug.ch>
  */
 
 /**
- * @ingroup qdisc_api
- * @defgroup red Random Early Detection (RED)
+ * @ingroup qdisc
+ * @defgroup qdisc_red Random Early Detection (RED)
  * @brief
  * @{
  */
@@ -20,8 +20,8 @@
 #include <netlink-tc.h>
 #include <netlink/netlink.h>
 #include <netlink/utils.h>
+#include <netlink/route/tc-api.h>
 #include <netlink/route/qdisc.h>
-#include <netlink/route/qdisc-modules.h>
 #include <netlink/route/sch/red.h>
 
 /** @cond SKIP */
@@ -34,44 +34,27 @@
 #define RED_ATTR_SCELL_LOG	0x40
 /** @endcond */
 
-static inline struct rtnl_red *red_qdisc(struct rtnl_qdisc *qdisc)
-{
-	return (struct rtnl_red *) qdisc->q_subdata;
-}
-
-static inline struct rtnl_red *red_alloc(struct rtnl_qdisc *qdisc)
-{
-	if (!qdisc->q_subdata)
-		qdisc->q_subdata = calloc(1, sizeof(struct rtnl_red));
-
-	return red_qdisc(qdisc);
-}
-
 static struct nla_policy red_policy[TCA_RED_MAX+1] = {
 	[TCA_RED_PARMS]		= { .minlen = sizeof(struct tc_red_qopt) },
 };
 
-static int red_msg_parser(struct rtnl_qdisc *qdisc)
+static int red_msg_parser(struct rtnl_tc *tc, void *data)
 {
 	struct nlattr *tb[TCA_RED_MAX+1];
-	struct rtnl_red *red;
+	struct rtnl_red *red = data;
 	struct tc_red_qopt *opts;
 	int err;
 
-	if (!(qdisc->ce_mask & TCA_ATTR_OPTS))
+	if (!(tc->ce_mask & TCA_ATTR_OPTS))
 		return 0;
 
-	err = tca_parse(tb, TCA_RED_MAX, (struct rtnl_tc *) qdisc, red_policy);
+	err = tca_parse(tb, TCA_RED_MAX, tc, red_policy);
 	if (err < 0)
 		return err;
 
 	if (!tb[TCA_RED_PARMS])
 		return -NLE_MISSING_ATTR;
 
-	red = red_alloc(qdisc);
-	if (!red)
-		return -NLE_NOMEM;
-
 	opts = nla_data(tb[TCA_RED_PARMS]);
 
 	red->qr_limit = opts->limit;
@@ -89,45 +72,42 @@ static int red_msg_parser(struct rtnl_qdisc *qdisc)
 	return 0;
 }
 
-static void red_dump_line(struct rtnl_qdisc *qdisc, struct nl_dump_params *p)
+static void red_dump_line(struct rtnl_tc *tc, void *data,
+			  struct nl_dump_params *p)
 {
-	struct rtnl_red *red = red_qdisc(qdisc);
+	struct rtnl_red *red = data;
 
 	if (red) {
 		/* XXX: limit, min, max, flags */
 	}
 }
 
-static void red_dump_details(struct rtnl_qdisc *qdisc, struct nl_dump_params *p)
+static void red_dump_details(struct rtnl_tc *tc, void *data,
+			     struct nl_dump_params *p)
 {
-	struct rtnl_red *red = red_qdisc(qdisc);
+	struct rtnl_red *red = data;
 
 	if (red) {
 		/* XXX: wlog, plog, scell_log */
 	}
 }
 
-static void red_dump_stats(struct rtnl_qdisc *qdisc, struct nl_dump_params *p)
+static void red_dump_stats(struct rtnl_tc *tc, void *data,
+			   struct nl_dump_params *p)
 {
-	struct rtnl_red *red = red_qdisc(qdisc);
+	struct rtnl_red *red = data;
 
 	if (red) {
 		/* XXX: xstats */
 	}
 }
 
-static struct nl_msg *red_get_opts(struct rtnl_qdisc *qdisc)
+static int red_msg_fill(struct rtnl_tc *tc, void *data, struct nl_msg *msg)
 {
-	struct rtnl_red *red;
-	struct nl_msg *msg;
+	struct rtnl_red *red = data;
 
-	red = red_qdisc(qdisc);
 	if (!red)
-		return NULL;
-
-	msg = nlmsg_alloc();
-	if (!msg)
-		goto errout;
+		BUG();
 
 #if 0
 	memset(&opts, 0, sizeof(opts));
@@ -139,10 +119,7 @@ static struct nl_msg *red_get_opts(struct rtnl_qdisc *qdisc)
 		goto errout;
 #endif
 
-	return msg;
-errout:
-	nlmsg_free(msg);
-	return NULL;
+	return -NLE_OPNOTSUPP;
 }
 
 /**
@@ -156,18 +133,15 @@ errout:
  * @arg limit		New limit in number of packets.
  * @return 0 on success or a negative error code.
  */
-int rtnl_red_set_limit(struct rtnl_qdisc *qdisc, int limit)
+void rtnl_red_set_limit(struct rtnl_qdisc *qdisc, int limit)
 {
 	struct rtnl_red *red;
 
-	red = red_alloc(qdisc);
-	if (!red)
-		return -NLE_NOMEM;
+	if (!(red = rtnl_tc_data(TC_CAST(qdisc))))
+		BUG();
 
 	red->qr_limit = limit;
 	red->qr_mask |= RED_ATTR_LIMIT;
-
-	return 0;
 }
 
 /**
@@ -179,8 +153,10 @@ int rtnl_red_get_limit(struct rtnl_qdisc *qdisc)
 {
 	struct rtnl_red *red;
 
-	red = red_qdisc(qdisc);
-	if (red && (red->qr_mask & RED_ATTR_LIMIT))
+	if (!(red = rtnl_tc_data(TC_CAST(qdisc))))
+		BUG();
+
+	if (red->qr_mask & RED_ATTR_LIMIT)
 		return red->qr_limit;
 	else
 		return -NLE_NOATTR;
@@ -188,25 +164,27 @@ int rtnl_red_get_limit(struct rtnl_qdisc *qdisc)
 
 /** @} */
 
-static struct rtnl_qdisc_ops red_ops = {
-	.qo_kind		= "red",
-	.qo_msg_parser		= red_msg_parser,
-	.qo_dump = {
+static struct rtnl_tc_ops red_ops = {
+	.to_kind		= "red",
+	.to_type		= RTNL_TC_TYPE_QDISC,
+	.to_size		= sizeof(struct rtnl_red),
+	.to_msg_parser		= red_msg_parser,
+	.to_dump = {
 	    [NL_DUMP_LINE]	= red_dump_line,
 	    [NL_DUMP_DETAILS]	= red_dump_details,
 	    [NL_DUMP_STATS]	= red_dump_stats,
 	},
-	.qo_get_opts		= red_get_opts,
+	.to_msg_fill		= red_msg_fill,
 };
 
 static void __init red_init(void)
 {
-	rtnl_qdisc_register(&red_ops);
+	rtnl_tc_register(&red_ops);
 }
 
 static void __exit red_exit(void)
 {
-	rtnl_qdisc_unregister(&red_ops);
+	rtnl_tc_unregister(&red_ops);
 }
 
 /** @} */