diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-23 01:11:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:11 -0500 |
commit | add93b610a4e66d36d0cf0b2596c3d3bcfdaee39 (patch) | |
tree | 073873879eb3b87981ee015f0f1ca48da8f1c696 /include/net | |
parent | 1e90474c377e92db7262a8968a45c1dd980ca9e5 (diff) |
[NET_SCHED]: Convert classifiers from rtnetlink to new netlink API
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/pkt_cls.h | 10 | ||||
-rw-r--r-- | include/net/sch_generic.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 2eaf20480024..8716eb757d51 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h | |||
@@ -129,8 +129,8 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts, | |||
129 | return 0; | 129 | return 0; |
130 | } | 130 | } |
131 | 131 | ||
132 | extern int tcf_exts_validate(struct tcf_proto *tp, struct rtattr **tb, | 132 | extern int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb, |
133 | struct rtattr *rate_tlv, struct tcf_exts *exts, | 133 | struct nlattr *rate_tlv, struct tcf_exts *exts, |
134 | struct tcf_ext_map *map); | 134 | struct tcf_ext_map *map); |
135 | extern void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts); | 135 | extern void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts); |
136 | extern void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst, | 136 | extern void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst, |
@@ -247,7 +247,7 @@ struct tcf_ematch_ops | |||
247 | 247 | ||
248 | extern int tcf_em_register(struct tcf_ematch_ops *); | 248 | extern int tcf_em_register(struct tcf_ematch_ops *); |
249 | extern int tcf_em_unregister(struct tcf_ematch_ops *); | 249 | extern int tcf_em_unregister(struct tcf_ematch_ops *); |
250 | extern int tcf_em_tree_validate(struct tcf_proto *, struct rtattr *, | 250 | extern int tcf_em_tree_validate(struct tcf_proto *, struct nlattr *, |
251 | struct tcf_ematch_tree *); | 251 | struct tcf_ematch_tree *); |
252 | extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *); | 252 | extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *); |
253 | extern int tcf_em_tree_dump(struct sk_buff *, struct tcf_ematch_tree *, int); | 253 | extern int tcf_em_tree_dump(struct sk_buff *, struct tcf_ematch_tree *, int); |
@@ -338,9 +338,9 @@ static inline int tcf_valid_offset(const struct sk_buff *skb, | |||
338 | #include <net/net_namespace.h> | 338 | #include <net/net_namespace.h> |
339 | 339 | ||
340 | static inline int | 340 | static inline int |
341 | tcf_change_indev(struct tcf_proto *tp, char *indev, struct rtattr *indev_tlv) | 341 | tcf_change_indev(struct tcf_proto *tp, char *indev, struct nlattr *indev_tlv) |
342 | { | 342 | { |
343 | if (rtattr_strlcpy(indev, indev_tlv, IFNAMSIZ) >= IFNAMSIZ) | 343 | if (nla_strlcpy(indev, indev_tlv, IFNAMSIZ) >= IFNAMSIZ) |
344 | return -EINVAL; | 344 | return -EINVAL; |
345 | return 0; | 345 | return 0; |
346 | } | 346 | } |
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 8cacdff24594..ab502ec1c61c 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -126,7 +126,7 @@ struct tcf_proto_ops | |||
126 | unsigned long (*get)(struct tcf_proto*, u32 handle); | 126 | unsigned long (*get)(struct tcf_proto*, u32 handle); |
127 | void (*put)(struct tcf_proto*, unsigned long); | 127 | void (*put)(struct tcf_proto*, unsigned long); |
128 | int (*change)(struct tcf_proto*, unsigned long, | 128 | int (*change)(struct tcf_proto*, unsigned long, |
129 | u32 handle, struct rtattr **, | 129 | u32 handle, struct nlattr **, |
130 | unsigned long *); | 130 | unsigned long *); |
131 | int (*delete)(struct tcf_proto*, unsigned long); | 131 | int (*delete)(struct tcf_proto*, unsigned long); |
132 | void (*walk)(struct tcf_proto*, struct tcf_walker *arg); | 132 | void (*walk)(struct tcf_proto*, struct tcf_walker *arg); |