1 files changed, 37 insertions, 26 deletions

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 9e90fdff470d..788d8378e587 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -9,7 +9,7 @@
 #include <net/pkt_sched.h>
 
 struct tcf_common {
-        struct tcf_common               *tcfc_next;
+        struct hlist_node               tcfc_head;
         u32                             tcfc_index;
         int                             tcfc_refcnt;
         int                             tcfc_bindcnt;
@@ -22,7 +22,7 @@ struct tcf_common {
         spinlock_t                      tcfc_lock;
         struct rcu_head                 tcfc_rcu;
 };
-#define tcf_next        common.tcfc_next
+#define tcf_head        common.tcfc_head
 #define tcf_index       common.tcfc_index
 #define tcf_refcnt      common.tcfc_refcnt
 #define tcf_bindcnt     common.tcfc_bindcnt
@@ -36,9 +36,10 @@ struct tcf_common {
 #define tcf_rcu         common.tcfc_rcu
 
 struct tcf_hashinfo {
-        struct tcf_common       **htab;
+        struct hlist_head       *htab;
         unsigned int            hmask;
-        rwlock_t                *lock;
+        spinlock_t              lock;
+        u32                     index;
 };
 
 static inline unsigned int tcf_hash(u32 index, unsigned int hmask)
@@ -46,33 +47,47 @@ static inline unsigned int tcf_hash(u32 index, unsigned int hmask)
         return index & hmask;
 }
 
+static inline int tcf_hashinfo_init(struct tcf_hashinfo *hf, unsigned int mask)
+{
+        int i;
+
+        spin_lock_init(&hf->lock);
+        hf->index = 0;
+        hf->hmask = mask;
+        hf->htab = kzalloc((mask + 1) * sizeof(struct hlist_head),
+                           GFP_KERNEL);
+        if (!hf->htab)
+                return -ENOMEM;
+        for (i = 0; i < mask + 1; i++)
+                INIT_HLIST_HEAD(&hf->htab[i]);
+        return 0;
+}
+
+static inline void tcf_hashinfo_destroy(struct tcf_hashinfo *hf)
+{
+        kfree(hf->htab);
+}
+
 #ifdef CONFIG_NET_CLS_ACT
 
 #define ACT_P_CREATED 1
 #define ACT_P_DELETED 1
 
-struct tcf_act_hdr {
-        struct tcf_common       common;
-};
-
 struct tc_action {
         void                    *priv;
         const struct tc_action_ops      *ops;
         __u32                   type; /* for backward compat(TCA_OLD_COMPAT) */
         __u32                   order;
-        struct tc_action        *next;
+        struct list_head        list;
 };
 
-#define TCA_CAP_NONE 0
 struct tc_action_ops {
-        struct tc_action_ops *next;
+        struct list_head head;
         struct tcf_hashinfo *hinfo;
         char    kind[IFNAMSIZ];
         __u32   type; /* TBD to match kind */
-        __u32   capab;  /* capabilities includes 4 bit version */
         struct module           *owner;
         int     (*act)(struct sk_buff *, const struct tc_action *, struct tcf_result *);
-        int     (*get_stats)(struct sk_buff *, struct tc_action *);
         int     (*dump)(struct sk_buff *, struct tc_action *, int, int);
         int     (*cleanup)(struct tc_action *, int bind);
         int     (*lookup)(struct tc_action *, u32);
@@ -82,34 +97,30 @@ struct tc_action_ops {
         int     (*walk)(struct sk_buff *, struct netlink_callback *, int, struct tc_action *);
 };
 
-struct tcf_common *tcf_hash_lookup(u32 index, struct tcf_hashinfo *hinfo);
+int tcf_hash_search(struct tc_action *a, u32 index);
 void tcf_hash_destroy(struct tcf_common *p, struct tcf_hashinfo *hinfo);
 int tcf_hash_release(struct tcf_common *p, int bind,
                      struct tcf_hashinfo *hinfo);
-int tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb,
-                       int type, struct tc_action *a);
-u32 tcf_hash_new_index(u32 *idx_gen, struct tcf_hashinfo *hinfo);
-int tcf_hash_search(struct tc_action *a, u32 index);
+u32 tcf_hash_new_index(struct tcf_hashinfo *hinfo);
 struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a,
-                                  int bind, struct tcf_hashinfo *hinfo);
+                                  int bind);
 struct tcf_common *tcf_hash_create(u32 index, struct nlattr *est,
                                    struct tc_action *a, int size,
-                                   int bind, u32 *idx_gen,
-                                   struct tcf_hashinfo *hinfo);
+                                   int bind);
 void tcf_hash_insert(struct tcf_common *p, struct tcf_hashinfo *hinfo);
 
 int tcf_register_action(struct tc_action_ops *a);
 int tcf_unregister_action(struct tc_action_ops *a);
-void tcf_action_destroy(struct tc_action *a, int bind);
-int tcf_action_exec(struct sk_buff *skb, const struct tc_action *a,
+void tcf_action_destroy(struct list_head *actions, int bind);
+int tcf_action_exec(struct sk_buff *skb, const struct list_head *actions,
                     struct tcf_result *res);
-struct tc_action *tcf_action_init(struct net *net, struct nlattr *nla,
+int tcf_action_init(struct net *net, struct nlattr *nla,
                                   struct nlattr *est, char *n, int ovr,
-                                  int bind);
+                                  int bind, struct list_head *);
 struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
                                     struct nlattr *est, char *n, int ovr,
                                     int bind);
-int tcf_action_dump(struct sk_buff *skb, struct tc_action *a, int, int);
+int tcf_action_dump(struct sk_buff *skb, struct list_head *, int, int);
 int tcf_action_dump_old(struct sk_buff *skb, struct tc_action *a, int, int);
 int tcf_action_dump_1(struct sk_buff *skb, struct tc_action *a, int, int);
 int tcf_action_copy_stats(struct sk_buff *, struct tc_action *, int);