lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PKT_SCHED] net classifier: style cleanup's

Browse Source 
Classifier code cleanup. Get rid of printk wrapper, and fix whitespace
and other style stuff reported by checkpatch

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2008-01-21 02:26:41 -08:00
committed by David S. Miller
parent 786a90366f
commit aa767bfea4
2 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
net/sched/cls_api.c
View File

@@ -29,12 +29,6 @@
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <net/pkt_cls.h> #include <net/pkt_cls.h>
#if 0 /* control */
#define DPRINTK(format,args...) printk(KERN_DEBUG format,##args)
#else
#define DPRINTK(format,args...)
#endif
/* The list of all installed classifier types */ /* The list of all installed classifier types */
static struct tcf_proto_ops *tcf_proto_base; static struct tcf_proto_ops *tcf_proto_base;
@@ -81,6 +75,7 @@ out:
write_unlock(&cls_mod_lock); write_unlock(&cls_mod_lock);
return rc; return rc;
} }
EXPORT_SYMBOL(register_tcf_proto_ops);
int unregister_tcf_proto_ops(struct tcf_proto_ops *ops) int unregister_tcf_proto_ops(struct tcf_proto_ops *ops)
{ {
@@ -100,6 +95,7 @@ out:
write_unlock(&cls_mod_lock); write_unlock(&cls_mod_lock);
return rc; return rc;
} }
EXPORT_SYMBOL(unregister_tcf_proto_ops);
static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n, static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n,
struct tcf_proto *tp, unsigned long fh, int event); struct tcf_proto *tp, unsigned long fh, int event);
@@ -107,7 +103,7 @@ static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n,
/* Select new prio value from the range, managed by kernel. */ /* Select new prio value from the range, managed by kernel. */
static __inline__ u32 tcf_auto_prio(struct tcf_proto *tp) static inline u32 tcf_auto_prio(struct tcf_proto *tp)
{ {
u32 first = TC_H_MAKE(0xC0000000U, 0U); u32 first = TC_H_MAKE(0xC0000000U, 0U);
@@ -160,15 +156,19 @@ replay:
/* Find head of filter chain. */ /* Find head of filter chain. */
/* Find link */ /* Find link */
if ((dev = __dev_get_by_index(&init_net, t->tcm_ifindex)) == NULL) dev = __dev_get_by_index(&init_net, t->tcm_ifindex);
if (dev == NULL)
return -ENODEV; return -ENODEV;
/* Find qdisc */ /* Find qdisc */
if (!parent) { if (!parent) {
q = dev->qdisc_sleeping; q = dev->qdisc_sleeping;
parent = q->handle; parent = q->handle;
} else if ((q = qdisc_lookup(dev, TC_H_MAJ(t->tcm_parent))) == NULL) } else {
q = qdisc_lookup(dev, TC_H_MAJ(t->tcm_parent));
if (q == NULL)
return -EINVAL; return -EINVAL;
}
/* Is it classful? */ /* Is it classful? */
if ((cops = q->ops->cl_ops) == NULL) if ((cops = q->ops->cl_ops) == NULL)
@@ -213,7 +213,8 @@ replay:
/* Create new proto tcf */ /* Create new proto tcf */
err = -ENOBUFS; err = -ENOBUFS;
if ((tp = kzalloc(sizeof(*tp), GFP_KERNEL)) == NULL) tp = kzalloc(sizeof(*tp), GFP_KERNEL);
if (tp == NULL)
goto errout; goto errout;
err = -EINVAL; err = -EINVAL;
tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND-1]); tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND-1]);
@@ -249,7 +250,9 @@ replay:
tp->q = q; tp->q = q;
tp->classify = tp_ops->classify; tp->classify = tp_ops->classify;
tp->classid = parent; tp->classid = parent;
if ((err = tp_ops->init(tp)) != 0) {
err = tp_ops->init(tp);
if (err != 0) {
module_put(tp_ops->owner); module_put(tp_ops->owner);
kfree(tp); kfree(tp);
goto errout; goto errout;
@@ -278,7 +281,8 @@ replay:
} }
err = -ENOENT; err = -ENOENT;
if (n->nlmsg_type != RTM_NEWTFILTER || !(n->nlmsg_flags&NLM_F_CREATE)) if (n->nlmsg_type != RTM_NEWTFILTER ||
!(n->nlmsg_flags & NLM_F_CREATE))
goto errout; goto errout;
} else { } else {
switch (n->nlmsg_type) { switch (n->nlmsg_type) {
@@ -314,9 +318,8 @@ errout:
return err; return err;
} }
static int static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp, unsigned long fh, unsigned long fh, u32 pid, u32 seq, u16 flags, int event)
u32 pid, u32 seq, u16 flags, int event)
{ {
struct tcmsg *tcm; struct tcmsg *tcm;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
@@ -361,17 +364,18 @@ static int tfilter_notify(struct sk_buff *oskb, struct nlmsghdr *n,
return -EINVAL; return -EINVAL;
} }
return rtnetlink_send(skb, &init_net, pid, RTNLGRP_TC, n->nlmsg_flags&NLM_F_ECHO); return rtnetlink_send(skb, &init_net, pid, RTNLGRP_TC,
n->nlmsg_flags & NLM_F_ECHO);
} }
struct tcf_dump_args struct tcf_dump_args {
{
struct tcf_walker w; struct tcf_walker w;
struct sk_buff *skb; struct sk_buff *skb;
struct netlink_callback *cb; struct netlink_callback *cb;
}; };
static int tcf_node_dump(struct tcf_proto *tp, unsigned long n, struct tcf_walker *arg) static int tcf_node_dump(struct tcf_proto *tp, unsigned long n,
struct tcf_walker *arg)
{ {
struct tcf_dump_args *a = (void *)arg; struct tcf_dump_args *a = (void *)arg;
@@ -431,9 +435,10 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0])); memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0]));
if (cb->args[1] == 0) { if (cb->args[1] == 0) {
if (tcf_fill_node(skb, tp, 0, NETLINK_CB(cb->skb).pid, if (tcf_fill_node(skb, tp, 0, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER) <= 0) { cb->nlh->nlmsg_seq, NLM_F_MULTI,
RTM_NEWTFILTER) <= 0)
break; break;
}
cb->args[1] = 1; cb->args[1] = 1;
} }
if (tp->ops->walk == NULL) if (tp->ops->walk == NULL)
@@ -460,8 +465,7 @@ out:
return skb->len; return skb->len;
} }
void void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
{ {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
if (exts->action) { if (exts->action) {
@@ -470,10 +474,9 @@ tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
} }
#endif #endif
} }
EXPORT_SYMBOL(tcf_exts_destroy);
int tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
int
tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
struct rtattr *rate_tlv, struct tcf_exts *exts, struct rtattr *rate_tlv, struct tcf_exts *exts,
struct tcf_ext_map *map) struct tcf_ext_map *map)
{ {
@@ -485,8 +488,9 @@ tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
struct tc_action *act; struct tc_action *act;
if (map->police && tb[map->police-1]) { if (map->police && tb[map->police-1]) {
act = tcf_action_init_1(tb[map->police-1], rate_tlv, "police", act = tcf_action_init_1(tb[map->police-1], rate_tlv,
TCA_ACT_NOREPLACE, TCA_ACT_BIND, &err); "police", TCA_ACT_NOREPLACE,
TCA_ACT_BIND, &err);
if (act == NULL) if (act == NULL)
return err; return err;
@@ -509,9 +513,9 @@ tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb,
return 0; return 0;
} }
EXPORT_SYMBOL(tcf_exts_validate);
void void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
struct tcf_exts *src) struct tcf_exts *src)
{ {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
@@ -525,9 +529,9 @@ tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
} }
#endif #endif
} }
EXPORT_SYMBOL(tcf_exts_change);
int int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
struct tcf_ext_map *map) struct tcf_ext_map *map)
{ {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
@@ -556,9 +560,10 @@ tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
rtattr_failure: __attribute__ ((unused)) rtattr_failure: __attribute__ ((unused))
return -1; return -1;
} }
EXPORT_SYMBOL(tcf_exts_dump);
int
tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts, int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
struct tcf_ext_map *map) struct tcf_ext_map *map)
{ {
#ifdef CONFIG_NET_CLS_ACT #ifdef CONFIG_NET_CLS_ACT
@@ -570,6 +575,7 @@ tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
rtattr_failure: __attribute__ ((unused)) rtattr_failure: __attribute__ ((unused))
return -1; return -1;
} }
EXPORT_SYMBOL(tcf_exts_dump_stats);
static int __init tc_filter_init(void) static int __init tc_filter_init(void)
{ {
@@ -582,11 +588,3 @@ static int __init tc_filter_init(void)
} }
subsys_initcall(tc_filter_init); subsys_initcall(tc_filter_init);
EXPORT_SYMBOL(register_tcf_proto_ops);
EXPORT_SYMBOL(unregister_tcf_proto_ops);
EXPORT_SYMBOL(tcf_exts_validate);
EXPORT_SYMBOL(tcf_exts_destroy);
EXPORT_SYMBOL(tcf_exts_change);
EXPORT_SYMBOL(tcf_exts_dump);
EXPORT_SYMBOL(tcf_exts_dump_stats);

40
net/sched/cls_tcindex.c
View File

@@ -29,19 +29,6 @@
#define DEFAULT_HASH_SIZE 64 /* optimized for diffserv */ #define DEFAULT_HASH_SIZE 64 /* optimized for diffserv */
#if 1 /* 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(tp) ((struct tcindex_data *) (tp)->root) #define PRIV(tp) ((struct tcindex_data *) (tp)->root)
@@ -104,7 +91,8 @@ static int tcindex_classify(struct sk_buff *skb, struct tcf_proto *tp,
struct tcindex_filter_result *f; struct tcindex_filter_result *f;
int key = (skb->tc_index & p->mask) >> p->shift; int key = (skb->tc_index & p->mask) >> p->shift;
D2PRINTK("tcindex_classify(skb %p,tp %p,res %p),p %p\n",skb,tp,res,p); pr_debug("tcindex_classify(skb %p,tp %p,res %p),p %p\n",
skb, tp, res, p);
f = tcindex_lookup(p, key); f = tcindex_lookup(p, key);
if (!f) { if (!f) {
@@ -112,11 +100,11 @@ static int tcindex_classify(struct sk_buff *skb, struct tcf_proto *tp,
return -1; return -1;
res->classid = TC_H_MAKE(TC_H_MAJ(tp->q->handle), key); res->classid = TC_H_MAKE(TC_H_MAJ(tp->q->handle), key);
res->class = 0; res->class = 0;
D2PRINTK("alg 0x%x\n",res->classid); pr_debug("alg 0x%x\n", res->classid);
return 0; return 0;
} }
*res = f->res; *res = f->res;
D2PRINTK("map 0x%x\n",res->classid); pr_debug("map 0x%x\n", res->classid);
return tcf_exts_exec(skb, &f->exts, res); return tcf_exts_exec(skb, &f->exts, res);
} }
@@ -127,7 +115,7 @@ static unsigned long tcindex_get(struct tcf_proto *tp, u32 handle)
struct tcindex_data *p = PRIV(tp); struct tcindex_data *p = PRIV(tp);
struct tcindex_filter_result *r; struct tcindex_filter_result *r;
DPRINTK("tcindex_get(tp %p,handle 0x%08x)\n",tp,handle); pr_debug("tcindex_get(tp %p,handle 0x%08x)\n", tp, handle);
if (p->perfect && handle >= p->alloc_hash) if (p->perfect && handle >= p->alloc_hash)
return 0; return 0;
r = tcindex_lookup(p, handle); r = tcindex_lookup(p, handle);
@@ -137,7 +125,7 @@ static unsigned long tcindex_get(struct tcf_proto *tp, u32 handle)
static void tcindex_put(struct tcf_proto *tp, unsigned long f) static void tcindex_put(struct tcf_proto *tp, unsigned long f)
{ {
DPRINTK("tcindex_put(tp %p,f 0x%lx)\n",tp,f); pr_debug("tcindex_put(tp %p,f 0x%lx)\n", tp, f);
} }
@@ -145,7 +133,7 @@ static int tcindex_init(struct tcf_proto *tp)
{ {
struct tcindex_data *p; struct tcindex_data *p;
DPRINTK("tcindex_init(tp %p)\n",tp); pr_debug("tcindex_init(tp %p)\n", tp);
p = kzalloc(sizeof(struct tcindex_data), GFP_KERNEL); p = kzalloc(sizeof(struct tcindex_data), GFP_KERNEL);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
@@ -166,7 +154,7 @@ __tcindex_delete(struct tcf_proto *tp, unsigned long arg, int lock)
struct tcindex_filter_result *r = (struct tcindex_filter_result *) arg; struct tcindex_filter_result *r = (struct tcindex_filter_result *) arg;
struct tcindex_filter *f = NULL; struct tcindex_filter *f = NULL;
DPRINTK("tcindex_delete(tp %p,arg 0x%lx),p %p,f %p\n",tp,arg,p,f); pr_debug("tcindex_delete(tp %p,arg 0x%lx),p %p,f %p\n", tp, arg, p, f);
if (p->perfect) { if (p->perfect) {
if (!r->res.class) if (!r->res.class)
return -ENOENT; return -ENOENT;
@@ -363,7 +351,7 @@ tcindex_change(struct tcf_proto *tp, unsigned long base, u32 handle,
struct tcindex_data *p = PRIV(tp); struct tcindex_data *p = PRIV(tp);
struct tcindex_filter_result *r = (struct tcindex_filter_result *) *arg; struct tcindex_filter_result *r = (struct tcindex_filter_result *) *arg;
DPRINTK("tcindex_change(tp %p,handle 0x%08x,tca %p,arg %p),opt %p," pr_debug("tcindex_change(tp %p,handle 0x%08x,tca %p,arg %p),opt %p,"
"p %p,r %p,*arg 0x%lx\n", "p %p,r %p,*arg 0x%lx\n",
tp, handle, tca, arg, opt, p, r, arg ? *arg : 0L); tp, handle, tca, arg, opt, p, r, arg ? *arg : 0L);
@@ -383,7 +371,7 @@ static void tcindex_walk(struct tcf_proto *tp, struct tcf_walker *walker)
struct tcindex_filter *f, *next; struct tcindex_filter *f, *next;
int i; int i;
DPRINTK("tcindex_walk(tp %p,walker %p),p %p\n",tp,walker,p); pr_debug("tcindex_walk(tp %p,walker %p),p %p\n", tp, walker, p);
if (p->perfect) { if (p->perfect) {
for (i = 0; i < p->hash; i++) { for (i = 0; i < p->hash; i++) {
if (!p->perfect[i].res.class) if (!p->perfect[i].res.class)
@@ -429,7 +417,7 @@ static void tcindex_destroy(struct tcf_proto *tp)
struct tcindex_data *p = PRIV(tp); struct tcindex_data *p = PRIV(tp);
struct tcf_walker walker; struct tcf_walker walker;
DPRINTK("tcindex_destroy(tp %p),p %p\n",tp,p); pr_debug("tcindex_destroy(tp %p),p %p\n", tp, p);
walker.count = 0; walker.count = 0;
walker.skip = 0; walker.skip = 0;
walker.fn = &tcindex_destroy_element; walker.fn = &tcindex_destroy_element;
@@ -449,9 +437,9 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
unsigned char *b = skb_tail_pointer(skb); unsigned char *b = skb_tail_pointer(skb);
struct rtattr *rta; struct rtattr *rta;
DPRINTK("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p,b %p\n", pr_debug("tcindex_dump(tp %p,fh 0x%lx,skb %p,t %p),p %p,r %p,b %p\n",
tp, fh, skb, t, p, r, b); tp, fh, skb, t, p, r, b);
DPRINTK("p->perfect %p p->h %p\n",p->perfect,p->h); pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h);
rta = (struct rtattr *) b; rta = (struct rtattr *) b;
RTA_PUT(skb, TCA_OPTIONS, 0, NULL); RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
if (!fh) { if (!fh) {
@@ -478,7 +466,7 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
} }
} }
} }
DPRINTK("handle = %d\n",t->tcm_handle); pr_debug("handle = %d\n", t->tcm_handle);
if (r->res.class) if (r->res.class)
RTA_PUT(skb, TCA_TCINDEX_CLASSID, 4, &r->res.classid); RTA_PUT(skb, TCA_TCINDEX_CLASSID, 4, &r->res.classid);