diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-16 16:03:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-16 16:03:39 -0500 |
| commit | ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a (patch) | |
| tree | 63f71ac24b38a93233eec17193fd7f0e63419e20 /include | |
| parent | f6581c704a8e50aa624ce1f94c2efa58c3f6ac86 (diff) | |
| download | linux-ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a.tar.gz linux-ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a.tar.bz2 linux-ee99b2d8bf4ad6d03046a8c2f25bad7cfd9de64a.zip | |
net: Revert sched action extack support series.
It was mis-applied and the changes had rejects.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/act_api.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h index 41d95930ffbc..6ed9692f20bd 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -87,13 +87,12 @@ struct tc_action_ops { struct tcf_result *); int (*dump)(struct sk_buff *, struct tc_action *, int, int); void (*cleanup)(struct tc_action *); - int (*lookup)(struct net *net, struct tc_action **a, u32 index); + int (*lookup)(struct net *, struct tc_action **, u32); int (*init)(struct net *net, struct nlattr *nla, struct nlattr *est, struct tc_action **act, int ovr, int bind); int (*walk)(struct net *, struct sk_buff *, - struct netlink_callback *, int, - const struct tc_action_ops *); + struct netlink_callback *, int, const struct tc_action_ops *); void (*stats_update)(struct tc_action *, u64, u32, u64); struct net_device *(*get_dev)(const struct tc_action *a); }; @@ -163,11 +162,10 @@ 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 tcf_proto *tp, struct nlattr *nla, struct nlattr *est, char *name, int ovr, int bind, - struct list_head *actions, struct netlink_ext_ack *extack); + 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, - struct netlink_ext_ack *extack); + 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); |