Merge tag 'platform-drivers-x86-v4.13-1' of git://git.infradead.org/linux-platform...

[karo-tx-linux.git] / include / net / act_api.h

diff --git a/include/net/act_api.h b/include/net/act_api.h
index cfa2ae33da9a19969cb3951b2a2278f61a7fd93f..26ffd8333f50fc6406e42c3536646a34df428f56 100644 (file)
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -42,6 +42,7 @@ struct tc_action {
        struct gnet_stats_basic_cpu __percpu *cpu_bstats;
        struct gnet_stats_queue __percpu *cpu_qstats;
        struct tc_cookie        *act_cookie;
+       struct tcf_chain        *goto_chain;
 };
 #define tcf_head       common.tcfa_head
 #define tcf_index      common.tcfa_index
@@ -180,12 +181,12 @@ int tcf_unregister_action(struct tc_action_ops *a,
 int tcf_action_destroy(struct list_head *actions, int bind);
 int tcf_action_exec(struct sk_buff *skb, struct tc_action **actions,
                    int nr_actions, struct tcf_result *res);
-int tcf_action_init(struct net *net, struct nlattr *nla,
-                                 struct nlattr *est, char *n, int ovr,
-                                 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_init(struct net *net, struct tcf_proto *tp, struct nlattr *nla,
+                   struct nlattr *est, char *name, int ovr, int bind,
+                   struct list_head *actions);
+struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,
+                                   struct nlattr *nla, struct nlattr *est,
+                                   char *name, int ovr, int bind);
 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);