diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-14 08:11:29 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-14 08:11:29 +0100 |
| commit | 8a0a8e1c42fdf656e7b729e9c468c2caa687adb7 (patch) | |
| tree | bde58e16dd5e6912deccac7e41b9a95f05187ea6 /net/sched/act_api.c | |
| parent | bb2d387c4d90f5b400b94a0fcb5aaef31dfc0789 (diff) | |
| parent | a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (diff) | |
| download | linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.bz2 | |
Merge 4.9-rc5 into usb-next
We want/need the USB fixes in here as well, for testing and merge
issues.
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index a512b18c0088..f893d180da1c 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -1028,8 +1028,7 @@ static struct nlattr *find_dump_kind(const struct nlmsghdr *n) if (tb[1] == NULL) return NULL; - if (nla_parse(tb2, TCA_ACT_MAX, nla_data(tb[1]), - nla_len(tb[1]), NULL) < 0) + if (nla_parse_nested(tb2, TCA_ACT_MAX, tb[1], NULL) < 0) return NULL; kind = tb2[TCA_ACT_KIND]; |