diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-21 20:58:16 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-21 20:58:16 +0300 |
| commit | dfb05553a55d89e6daae9cb9abfdf4751e14d72d (patch) | |
| tree | 4b6135513c77437534060999f462638e4766beb3 /include | |
| parent | b1d9fc41aab11f9520b2e0d57ae872e2ec5d6f32 (diff) | |
| parent | 4392053879717edb0c4756a3878c0274267e237b (diff) | |
| download | linux-dfb05553a55d89e6daae9cb9abfdf4751e14d72d.tar.xz | |
Merge branch 'tc-filter-cleanup-destroy-delete'
Cong Wang says:
====================
net_sched: clean up tc filter destroy and delete logic
The first patch fixes a potenial race condition, the second one
is pure cleanup.
====================
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sch_generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 65d502610314..22e52093bfda 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -204,14 +204,14 @@ struct tcf_proto_ops { const struct tcf_proto *, struct tcf_result *); int (*init)(struct tcf_proto*); - bool (*destroy)(struct tcf_proto*, bool); + void (*destroy)(struct tcf_proto*); unsigned long (*get)(struct tcf_proto*, u32 handle); int (*change)(struct net *net, struct sk_buff *, struct tcf_proto*, unsigned long, u32 handle, struct nlattr **, unsigned long *, bool); - int (*delete)(struct tcf_proto*, unsigned long); + int (*delete)(struct tcf_proto*, unsigned long, bool*); void (*walk)(struct tcf_proto*, struct tcf_walker *arg); /* rtnetlink specific */ |