diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-31 23:52:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-31 23:52:20 -0700 |
| commit | 5510b3c2a173921374ec847848fb20b98e1c698a (patch) | |
| tree | c9e185281ef17280ce0dc30be7923124874736b0 /include/net/act_api.h | |
| parent | 17f901e8915cb922c2ca710835ef34f166f53ee9 (diff) | |
| parent | 7c764cec3703583247c4ab837c652975a3d41f4b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/s390/net/bpf_jit_comp.c
drivers/net/ethernet/ti/netcp_ethss.c
net/bridge/br_multicast.c
net/ipv4/ip_fragment.c
All four conflicts were cases of simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/act_api.h')
| -rw-r--r-- | include/net/act_api.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h index 8d2a707a9e87..4519c81304bd 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h @@ -112,7 +112,6 @@ struct tc_action_ops { int tcf_hash_search(struct tc_action *a, u32 index); void tcf_hash_destroy(struct tc_action *a); -int tcf_hash_release(struct tc_action *a, int bind); u32 tcf_hash_new_index(struct tcf_hashinfo *hinfo); int tcf_hash_check(u32 index, struct tc_action *a, int bind); int tcf_hash_create(u32 index, struct nlattr *est, struct tc_action *a, @@ -120,6 +119,13 @@ int tcf_hash_create(u32 index, struct nlattr *est, struct tc_action *a, void tcf_hash_cleanup(struct tc_action *a, struct nlattr *est); void tcf_hash_insert(struct tc_action *a); +int __tcf_hash_release(struct tc_action *a, bool bind, bool strict); + +static inline int tcf_hash_release(struct tc_action *a, bool bind) +{ + return __tcf_hash_release(a, bind, false); +} + int tcf_register_action(struct tc_action_ops *a, unsigned int mask); int tcf_unregister_action(struct tc_action_ops *a); int tcf_action_destroy(struct list_head *actions, int bind); |