diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 09:20:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-25 09:20:49 +0100 |
| commit | 692665c621bb73f298d37bf6c6dad47ef94a5c2b (patch) | |
| tree | e8a304fb67125cbae6403434edc424b77efcaf97 /net/sched/act_api.c | |
| parent | dt-bindings: mt8173-mtu3: add reference clock (diff) | |
| parent | Linux 4.10-rc5 (diff) | |
| download | linux-692665c621bb73f298d37bf6c6dad47ef94a5c2b.tar.xz linux-692665c621bb73f298d37bf6c6dad47ef94a5c2b.zip | |
Merge 4.10-rc5 into usb-next
We need the USB fixes in here as well to handle future merge issues and
dependancies.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched/act_api.c')
| -rw-r--r-- | net/sched/act_api.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 2095c83ce773..e10456ef6f7a 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -900,8 +900,6 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, goto err; } act->order = i; - if (event == RTM_GETACTION) - act->tcfa_refcnt++; list_add_tail(&act->list, &actions); } @@ -914,7 +912,8 @@ tca_action_gd(struct net *net, struct nlattr *nla, struct nlmsghdr *n, return ret; } err: - tcf_action_destroy(&actions, 0); + if (event != RTM_GETACTION) + tcf_action_destroy(&actions, 0); return ret; } |