Skip to content

L
linux-davinci
Commit 81da99ed authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files
Options

[PKT_SCHED] dsmark: get rid of wrappers 

Remove extraneous macro wrappers for printk and qdisc_priv.
Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d20b3109
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 49 deletions
net/sched/sch_dsmark.c
View file @ 81da99ed
...@@ -15,23 +15,6 @@ ...@@ -15,23 +15,6 @@
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#if 0 /* control */
#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
#else
#define DPRINTK(format,args...)
#endif
#if 0 /* data */
#define D2PRINTK(format,args...) printk(KERN_DEBUG format,##args)
#else
#define D2PRINTK(format,args...)
#endif
#define PRIV(sch) ((struct dsmark_qdisc_data *) qdisc_priv(sch))
/* /*
* classid class marking * classid class marking
* ------- ----- ------- * ------- ----- -------
...@@ -81,9 +64,9 @@ static inline int dsmark_valid_index(struct dsmark_qdisc_data *p, u16 index) ...@@ -81,9 +64,9 @@ static inline int dsmark_valid_index(struct dsmark_qdisc_data *p, u16 index)
static int dsmark_graft(struct Qdisc *sch, unsigned long arg, static int dsmark_graft(struct Qdisc *sch, unsigned long arg,
struct Qdisc *new, struct Qdisc **old) struct Qdisc *new, struct Qdisc **old)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
DPRINTK("dsmark_graft(sch %p,[qdisc %p],new %p,old %p)\n", pr_debug("dsmark_graft(sch %p,[qdisc %p],new %p,old %p)\n",
sch, p, new, old); sch, p, new, old);
if (new == NULL) { if (new == NULL) {
...@@ -104,13 +87,14 @@ static int dsmark_graft(struct Qdisc *sch, unsigned long arg, ...@@ -104,13 +87,14 @@ static int dsmark_graft(struct Qdisc *sch, unsigned long arg,
static struct Qdisc *dsmark_leaf(struct Qdisc *sch, unsigned long arg) static struct Qdisc *dsmark_leaf(struct Qdisc *sch, unsigned long arg)
{ {
return PRIV(sch)->q; struct dsmark_qdisc_data *p = qdisc_priv(sch);
return p->q;
} }
static unsigned long dsmark_get(struct Qdisc *sch, u32 classid) static unsigned long dsmark_get(struct Qdisc *sch, u32 classid)
{ {
DPRINTK("dsmark_get(sch %p,[qdisc %p],classid %x)\n", pr_debug("dsmark_get(sch %p,[qdisc %p],classid %x)\n",
sch, PRIV(sch), classid); sch, qdisc_priv(sch), classid);
return TC_H_MIN(classid) + 1; return TC_H_MIN(classid) + 1;
} }
...@@ -128,13 +112,13 @@ static void dsmark_put(struct Qdisc *sch, unsigned long cl) ...@@ -128,13 +112,13 @@ static void dsmark_put(struct Qdisc *sch, unsigned long cl)
static int dsmark_change(struct Qdisc *sch, u32 classid, u32 parent, static int dsmark_change(struct Qdisc *sch, u32 classid, u32 parent,
struct rtattr **tca, unsigned long *arg) struct rtattr **tca, unsigned long *arg)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
struct rtattr *opt = tca[TCA_OPTIONS-1]; struct rtattr *opt = tca[TCA_OPTIONS-1];
struct rtattr *tb[TCA_DSMARK_MAX]; struct rtattr *tb[TCA_DSMARK_MAX];
int err = -EINVAL; int err = -EINVAL;
u8 mask = 0; u8 mask = 0;
DPRINTK("dsmark_change(sch %p,[qdisc %p],classid %x,parent %x)," pr_debug("dsmark_change(sch %p,[qdisc %p],classid %x,parent %x),"
"arg 0x%lx\n", sch, p, classid, parent, *arg); "arg 0x%lx\n", sch, p, classid, parent, *arg);
if (!dsmark_valid_index(p, *arg)) { if (!dsmark_valid_index(p, *arg)) {
...@@ -162,7 +146,7 @@ rtattr_failure: ...@@ -162,7 +146,7 @@ rtattr_failure:
static int dsmark_delete(struct Qdisc *sch, unsigned long arg) static int dsmark_delete(struct Qdisc *sch, unsigned long arg)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
if (!dsmark_valid_index(p, arg)) if (!dsmark_valid_index(p, arg))
return -EINVAL; return -EINVAL;
...@@ -175,10 +159,10 @@ static int dsmark_delete(struct Qdisc *sch, unsigned long arg) ...@@ -175,10 +159,10 @@ static int dsmark_delete(struct Qdisc *sch, unsigned long arg)
static void dsmark_walk(struct Qdisc *sch,struct qdisc_walker *walker) static void dsmark_walk(struct Qdisc *sch,struct qdisc_walker *walker)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
int i; int i;
DPRINTK("dsmark_walk(sch %p,[qdisc %p],walker %p)\n", sch, p, walker); pr_debug("dsmark_walk(sch %p,[qdisc %p],walker %p)\n", sch, p, walker);
if (walker->stop) if (walker->stop)
return; return;
...@@ -197,19 +181,20 @@ ignore: ...@@ -197,19 +181,20 @@ ignore:
} }
} }
static struct tcf_proto **dsmark_find_tcf(struct Qdisc *sch,unsigned long cl) static inline struct tcf_proto **dsmark_find_tcf(struct Qdisc *sch,unsigned long cl)
{ {
return &PRIV(sch)->filter_list; struct dsmark_qdisc_data *p = qdisc_priv(sch);
return &p->filter_list;
} }
/* --------------------------- Qdisc operations ---------------------------- */ /* --------------------------- Qdisc operations ---------------------------- */
static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch) static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
int err; int err;
D2PRINTK("dsmark_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); pr_debug("dsmark_enqueue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
if (p->set_tc_index) { if (p->set_tc_index) {
/* FIXME: Safe with non-linear skbs? --RR */ /* FIXME: Safe with non-linear skbs? --RR */
...@@ -234,7 +219,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch) ...@@ -234,7 +219,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
struct tcf_result res; struct tcf_result res;
int result = tc_classify(skb, p->filter_list, &res); int result = tc_classify(skb, p->filter_list, &res);
D2PRINTK("result %d class 0x%04x\n", result, res.classid); pr_debug("result %d class 0x%04x\n", result, res.classid);
switch (result) { switch (result) {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
...@@ -272,11 +257,11 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch) ...@@ -272,11 +257,11 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
struct sk_buff *skb; struct sk_buff *skb;
u32 index; u32 index;
D2PRINTK("dsmark_dequeue(sch %p,[qdisc %p])\n", sch, p); pr_debug("dsmark_dequeue(sch %p,[qdisc %p])\n", sch, p);
skb = p->q->ops->dequeue(p->q); skb = p->q->ops->dequeue(p->q);
if (skb == NULL) if (skb == NULL)
...@@ -285,7 +270,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) ...@@ -285,7 +270,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
sch->q.qlen--; sch->q.qlen--;
index = skb->tc_index & (p->indices - 1); index = skb->tc_index & (p->indices - 1);
D2PRINTK("index %d->%d\n", skb->tc_index, index); pr_debug("index %d->%d\n", skb->tc_index, index);
switch (skb->protocol) { switch (skb->protocol) {
case __constant_htons(ETH_P_IP): case __constant_htons(ETH_P_IP):
...@@ -314,10 +299,10 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) ...@@ -314,10 +299,10 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
static int dsmark_requeue(struct sk_buff *skb,struct Qdisc *sch) static int dsmark_requeue(struct sk_buff *skb,struct Qdisc *sch)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
int err; int err;
D2PRINTK("dsmark_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p); pr_debug("dsmark_requeue(skb %p,sch %p,[qdisc %p])\n", skb, sch, p);
err = p->q->ops->requeue(skb, p->q); err = p->q->ops->requeue(skb, p->q);
if (err != NET_XMIT_SUCCESS) { if (err != NET_XMIT_SUCCESS) {
...@@ -333,10 +318,10 @@ static int dsmark_requeue(struct sk_buff *skb,struct Qdisc *sch) ...@@ -333,10 +318,10 @@ static int dsmark_requeue(struct sk_buff *skb,struct Qdisc *sch)
static unsigned int dsmark_drop(struct Qdisc *sch) static unsigned int dsmark_drop(struct Qdisc *sch)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
unsigned int len; unsigned int len;
DPRINTK("dsmark_reset(sch %p,[qdisc %p])\n", sch, p); pr_debug("dsmark_reset(sch %p,[qdisc %p])\n", sch, p);
if (p->q->ops->drop == NULL) if (p->q->ops->drop == NULL)
return 0; return 0;
...@@ -350,14 +335,14 @@ static unsigned int dsmark_drop(struct Qdisc *sch) ...@@ -350,14 +335,14 @@ static unsigned int dsmark_drop(struct Qdisc *sch)
static int dsmark_init(struct Qdisc *sch, struct rtattr *opt) static int dsmark_init(struct Qdisc *sch, struct rtattr *opt)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
struct rtattr *tb[TCA_DSMARK_MAX]; struct rtattr *tb[TCA_DSMARK_MAX];
int err = -EINVAL; int err = -EINVAL;
u32 default_index = NO_DEFAULT_INDEX; u32 default_index = NO_DEFAULT_INDEX;
u16 indices; u16 indices;
u8 *mask; u8 *mask;
DPRINTK("dsmark_init(sch %p,[qdisc %p],opt %p)\n", sch, p, opt); pr_debug("dsmark_init(sch %p,[qdisc %p],opt %p)\n", sch, p, opt);
if (!opt || rtattr_parse_nested(tb, TCA_DSMARK_MAX, opt) < 0) if (!opt || rtattr_parse_nested(tb, TCA_DSMARK_MAX, opt) < 0)
goto errout; goto errout;
...@@ -389,7 +374,7 @@ static int dsmark_init(struct Qdisc *sch, struct rtattr *opt) ...@@ -389,7 +374,7 @@ static int dsmark_init(struct Qdisc *sch, struct rtattr *opt)
if (p->q == NULL) if (p->q == NULL)
p->q = &noop_qdisc; p->q = &noop_qdisc;
DPRINTK("dsmark_init: qdisc %p\n", p->q); pr_debug("dsmark_init: qdisc %p\n", p->q);
err = 0; err = 0;
errout: errout:
...@@ -399,18 +384,18 @@ rtattr_failure: ...@@ -399,18 +384,18 @@ rtattr_failure:
static void dsmark_reset(struct Qdisc *sch) static void dsmark_reset(struct Qdisc *sch)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
DPRINTK("dsmark_reset(sch %p,[qdisc %p])\n", sch, p); pr_debug("dsmark_reset(sch %p,[qdisc %p])\n", sch, p);
qdisc_reset(p->q); qdisc_reset(p->q);
sch->q.qlen = 0; sch->q.qlen = 0;
} }
static void dsmark_destroy(struct Qdisc *sch) static void dsmark_destroy(struct Qdisc *sch)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
DPRINTK("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p); pr_debug("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p);
tcf_destroy_chain(p->filter_list); tcf_destroy_chain(p->filter_list);
qdisc_destroy(p->q); qdisc_destroy(p->q);
...@@ -420,10 +405,10 @@ static void dsmark_destroy(struct Qdisc *sch) ...@@ -420,10 +405,10 @@ static void dsmark_destroy(struct Qdisc *sch)
static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl, static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
struct sk_buff *skb, struct tcmsg *tcm) struct sk_buff *skb, struct tcmsg *tcm)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
struct rtattr *opts = NULL; struct rtattr *opts = NULL;
DPRINTK("dsmark_dump_class(sch %p,[qdisc %p],class %ld\n", sch, p, cl); pr_debug("dsmark_dump_class(sch %p,[qdisc %p],class %ld\n", sch, p, cl);
if (!dsmark_valid_index(p, cl)) if (!dsmark_valid_index(p, cl))
return -EINVAL; return -EINVAL;
...@@ -443,7 +428,7 @@ rtattr_failure: ...@@ -443,7 +428,7 @@ rtattr_failure:
static int dsmark_dump(struct Qdisc *sch, struct sk_buff *skb) static int dsmark_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
struct dsmark_qdisc_data *p = PRIV(sch); struct dsmark_qdisc_data *p = qdisc_priv(sch);
struct rtattr *opts = NULL; struct rtattr *opts = NULL;
opts = RTA_NEST(skb, TCA_OPTIONS); opts = RTA_NEST(skb, TCA_OPTIONS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment