struct rsvp_filter *f;
while ((f = s->ht[h2]) != NULL) {
+ unsigned long cl;
+
s->ht[h2] = f->next;
- tcf_unbind_filter(tp, &f->res);
+ if ((cl = __cls_set_class(&f->res.class, 0)) != 0)
+ tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
#ifdef CONFIG_NET_CLS_POLICE
tcf_police_release(f->police,TCA_ACT_UNBIND);
#endif
for (fp = &s->ht[(h>>8)&0xFF]; *fp; fp = &(*fp)->next) {
if (*fp == f) {
+ unsigned long cl;
+
+
tcf_tree_lock(tp);
*fp = f->next;
tcf_tree_unlock(tp);
- tcf_unbind_filter(tp, &f->res);
+
+ if ((cl = cls_set_class(tp, &f->res.class, 0)) != 0)
+ tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
+
#ifdef CONFIG_NET_CLS_POLICE
tcf_police_release(f->police,TCA_ACT_UNBIND);
#endif
if (f->handle != handle && handle)
return -EINVAL;
if (tb[TCA_RSVP_CLASSID-1]) {
+ unsigned long cl;
+
f->res.classid = *(u32*)RTA_DATA(tb[TCA_RSVP_CLASSID-1]);
- tcf_bind_filter(tp, &f->res, base);
+ cl = cls_set_class(tp, &f->res.class, tp->q->ops->cl_ops->bind_tcf(tp->q, base, f->res.classid));
+ if (cl)
+ tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
}
#ifdef CONFIG_NET_CLS_POLICE
if (tb[TCA_RSVP_POLICE-1]) {
- err = tcf_change_police(tp, &f->police,
- tb[TCA_RSVP_POLICE-1], tca[TCA_RATE-1]);
- if (err < 0)
- return err;
+ struct tcf_police *police = tcf_police_locate(tb[TCA_RSVP_POLICE-1], tca[TCA_RATE-1]);
+
+ tcf_tree_lock(tp);
+ police = xchg(&f->police, police);
+ tcf_tree_unlock(tp);
+
+ tcf_police_release(police,TCA_ACT_UNBIND);
}
#endif
return 0;
f->sess = s;
if (f->tunnelhdr == 0)
- tcf_bind_filter(tp, &f->res, base);
+ cls_set_class(tp, &f->res.class, tp->q->ops->cl_ops->bind_tcf(tp->q, base, f->res.classid));
#ifdef CONFIG_NET_CLS_POLICE
if (tb[TCA_RSVP_POLICE-1])
- tcf_change_police(tp, &f->police, tb[TCA_RSVP_POLICE-1], tca[TCA_RATE-1]);
+ f->police = tcf_police_locate(tb[TCA_RSVP_POLICE-1], tca[TCA_RATE-1]);
#endif
for (fp = &s->ht[h2]; *fp; fp = &(*fp)->next)
}
if (arg->fn(tp, (unsigned long)f, arg) < 0) {
arg->stop = 1;
- return;
+ break;
}
arg->count++;
}
if (((f->handle>>8)&0xFF) != 16)
RTA_PUT(skb, TCA_RSVP_SRC, sizeof(f->src), f->src);
#ifdef CONFIG_NET_CLS_POLICE
- if (tcf_dump_police(skb, f->police, TCA_RSVP_POLICE) < 0)
- goto rtattr_failure;
+ if (f->police) {
+ struct rtattr * p_rta = (struct rtattr*)skb->tail;
+
+ RTA_PUT(skb, TCA_RSVP_POLICE, 0, NULL);
+
+ if (tcf_police_dump(skb, f->police) < 0)
+ goto rtattr_failure;
+
+ p_rta->rta_len = skb->tail - (u8*)p_rta;
+ }
#endif
rta->rta_len = skb->tail - b;
#ifdef CONFIG_NET_CLS_POLICE
- if (f->police)
- if (tcf_police_dump_stats(skb, f->police) < 0)
+ if (f->police) {
+ if (qdisc_copy_stats(skb, &f->police->stats,
+ f->police->stats_lock))
goto rtattr_failure;
+ }
#endif
return skb->len;