diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-02 19:30:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-02 19:30:09 +0200 |
| commit | 99097a214b0c15f7595ac8f2788662f3941c1992 (patch) | |
| tree | 9e496a96ea36ccd9e97509878fadeecd671e28aa /include/net/netlink.h | |
| parent | Merge tag 'lkdtm-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kee... (diff) | |
| parent | Linux 5.3-rc7 (diff) | |
| download | linux-99097a214b0c15f7595ac8f2788662f3941c1992.tar.xz linux-99097a214b0c15f7595ac8f2788662f3941c1992.zip | |
Merge 5.3-rc7 into char-misc-next
We need the fixes in here as well for testing and merges
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/netlink.h')
| -rw-r--r-- | include/net/netlink.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index e4650e5b64a1..b140c8f1be22 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -684,9 +684,8 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen, const struct nla_policy *policy, struct netlink_ext_ack *extack) { - return __nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen), - nlmsg_attrlen(nlh, hdrlen), policy, - NL_VALIDATE_STRICT, extack); + return __nlmsg_parse(nlh, hdrlen, tb, maxtype, policy, + NL_VALIDATE_STRICT, extack); } /** |