From: Johannes Berg <johannes@sipsolutions.net>
To: backports@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 3/3] backports: netlink: fix nla_validate_nested()
Date: Thu, 12 Mar 2020 16:59:13 +0100 [thread overview]
Message-ID: <20200312165913.14bfeceb4e2e.I026c8a13b9f070ccccbf29547d1289c362782881@changeid> (raw)
In-Reply-To: <20200312165913.e9a97c70de23.Idb983599e482232ae3cfc3328e837e8a9bf1af7a@changeid>
From: Johannes Berg <johannes.berg@intel.com>
I had accidentally named this nl80211_validate_nested(),
and it got renamed in 5.6.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
backport/backport-include/net/netlink.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/backport/backport-include/net/netlink.h b/backport/backport-include/net/netlink.h
index bc24adfb4d63..675e43fc4e31 100644
--- a/backport/backport-include/net/netlink.h
+++ b/backport/backport-include/net/netlink.h
@@ -266,17 +266,17 @@ nla_validate_nested_deprecated(const struct nlattr *start, int maxtype,
}
#endif /* < 5.2 */
-#if LINUX_VERSION_IS_LESS(5,3,0)
-#define nl80211_validate_nested LINUX_BACKPORT(nl80211_validate_nested)
+#if LINUX_VERSION_IS_LESS(5,6,0)
+#define nla_validate_nested LINUX_BACKPORT(nla_validate_nested)
static inline int
-nl80211_validate_nested(const struct nlattr *start, int maxtype,
- const struct nla_policy *policy,
- struct netlink_ext_ack *extack)
+nla_validate_nested(const struct nlattr *start, int maxtype,
+ const struct nla_policy *policy,
+ struct netlink_ext_ack *extack)
{
return __nla_validate_nested(start, maxtype, policy,
NL_VALIDATE_STRICT, extack);
}
-#endif /* < 5.3 */
+#endif /* < 5.6 */
#if LINUX_VERSION_IS_LESS(5,1,0)
#undef NLA_POLICY_NESTED
--
2.24.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2020-03-12 15:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 15:59 [PATCH 1/3] backports: add linux/units.h Johannes Berg
2020-03-12 15:59 ` [PATCH 2/3] backports: skbuff: add skb_list_walk_safe() and skb_mark_not_on_list() Johannes Berg
2020-03-20 23:38 ` Hauke Mehrtens
2020-03-12 15:59 ` Johannes Berg [this message]
2020-03-20 23:39 ` [PATCH 1/3] backports: add linux/units.h Hauke Mehrtens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200312165913.14bfeceb4e2e.I026c8a13b9f070ccccbf29547d1289c362782881@changeid \
--to=johannes@sipsolutions.net \
--cc=backports@vger.kernel.org \
--cc=johannes.berg@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).