Commit d8cf0d5e authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller

[PKT_SCHED]: cls_tcindex: Use generic routines for class binding and police config/dump

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c4e6d25
......@@ -165,7 +165,6 @@ static int tcindex_delete(struct tcf_proto *tp, unsigned long arg)
struct tcindex_data *p = PRIV(tp);
struct tcindex_filter_result *r = (struct tcindex_filter_result *) arg;
struct tcindex_filter *f = NULL;
unsigned long cl;
DPRINTK("tcindex_delete(tp %p,arg 0x%lx),p %p,f %p\n",tp,arg,p,f);
if (p->perfect) {
......@@ -187,9 +186,7 @@ static int tcindex_delete(struct tcf_proto *tp, unsigned long arg)
*walk = f->next;
tcf_tree_unlock(tp);
}
cl = __cls_set_class(&r->res.class,0);
if (cl)
tp->q->ops->cl_ops->unbind_tcf(tp->q,cl);
tcf_unbind_filter(tp, &r->res);
#ifdef CONFIG_NET_CLS_POLICE
tcf_police_release(r->police, TCA_ACT_UNBIND);
#endif
......@@ -313,28 +310,19 @@ static int tcindex_change(struct tcf_proto *tp,unsigned long base,u32 handle,
}
DPRINTK("r=%p\n",r);
if (tb[TCA_TCINDEX_CLASSID-1]) {
unsigned long cl = cls_set_class(tp,&r->res.class,0);
if (cl)
tp->q->ops->cl_ops->unbind_tcf(tp->q,cl);
r->res.classid = *(__u32 *) RTA_DATA(tb[TCA_TCINDEX_CLASSID-1]);
r->res.class = tp->q->ops->cl_ops->bind_tcf(tp->q,base,
r->res.classid);
tcf_bind_filter(tp, &r->res, base);
if (!r->res.class) {
r->res.classid = 0;
return -ENOENT;
}
}
#ifdef CONFIG_NET_CLS_POLICE
{
struct tcf_police *police;
police = tb[TCA_TCINDEX_POLICE-1] ?
tcf_police_locate(tb[TCA_TCINDEX_POLICE-1],NULL) : NULL;
tcf_tree_lock(tp);
police = xchg(&r->police,police);
tcf_tree_unlock(tp);
tcf_police_release(police,TCA_ACT_UNBIND);
if (tb[TCA_TCINDEX_POLICE-1]) {
int err = tcf_change_police(tp, &r->police, tb[TCA_TCINDEX_POLICE-1], NULL);
if (err < 0)
return err;
}
#endif
if (r != &new_filter_result)
......@@ -459,14 +447,8 @@ static int tcindex_dump(struct tcf_proto *tp, unsigned long fh,
if (r->res.class)
RTA_PUT(skb, TCA_TCINDEX_CLASSID, 4, &r->res.classid);
#ifdef CONFIG_NET_CLS_POLICE
if (r->police) {
struct rtattr *p_rta = (struct rtattr *) skb->tail;
RTA_PUT(skb,TCA_TCINDEX_POLICE,0,NULL);
if (tcf_police_dump(skb,r->police) < 0)
if (tcf_dump_police(skb, r->police, TCA_TCINDEX_POLICE) < 0)
goto rtattr_failure;
p_rta->rta_len = skb->tail-(u8 *) p_rta;
}
#endif
}
rta->rta_len = skb->tail-b;
......
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