Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / include / net / sch_generic.h

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index b931f02..4fc88f3 100644 (file)
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -181,8 +181,9 @@ struct tcf_proto_ops {
        struct tcf_proto_ops    *next;
        char                    kind[IFNAMSIZ];
 
-       int                     (*classify)(struct sk_buff*, struct tcf_proto*,
-                                       struct tcf_result *);
+       int                     (*classify)(struct sk_buff *,
+                                           const struct tcf_proto *,
+                                           struct tcf_result *);
        int                     (*init)(struct tcf_proto*);
        void                    (*destroy)(struct tcf_proto*);
 
@@ -205,8 +206,9 @@ struct tcf_proto {
        /* Fast access part */
        struct tcf_proto        *next;
        void                    *root;
-       int                     (*classify)(struct sk_buff*, struct tcf_proto*,
-                                       struct tcf_result *);
+       int                     (*classify)(struct sk_buff *,
+                                           const struct tcf_proto *,
+                                           struct tcf_result *);
        __be16                  protocol;
 
        /* All the rest */
@@ -214,7 +216,7 @@ struct tcf_proto {
        u32                     classid;
        struct Qdisc            *q;
        void                    *data;
-       struct tcf_proto_ops    *ops;
+       const struct tcf_proto_ops      *ops;
 };
 
 struct qdisc_skb_cb {