netlink: rename nl80211_validate_nested() to nla_validate_nested()
authorMichal Kubecek <mkubecek@suse.cz>
Wed, 11 Dec 2019 09:58:19 +0000 (10:58 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Dec 2019 01:07:05 +0000 (17:07 -0800)
Function nl80211_validate_nested() is not specific to nl80211, it's
a counterpart to nla_validate_nested_deprecated() with strict validation.
For consistency with other validation and parse functions, rename it to
nla_validate_nested().

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netlink.h
net/wireless/nl80211.c

index b140c8f1be22d2e9943d7d98ae9e7db3c076f20b..56c365dc6dc791c4edb19e85cd451fa6030f16f3 100644 (file)
@@ -1735,7 +1735,7 @@ static inline void nla_nest_cancel(struct sk_buff *skb, struct nlattr *start)
 }
 
 /**
- * nla_validate_nested - Validate a stream of nested attributes
+ * __nla_validate_nested - Validate a stream of nested attributes
  * @start: container attribute
  * @maxtype: maximum attribute type to be expected
  * @policy: validation policy
@@ -1758,9 +1758,9 @@ static inline int __nla_validate_nested(const struct nlattr *start, int maxtype,
 }
 
 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);
index da5262b2298bda73837facb23781a3dfb8f26ca3..fa3526592c51bda6da1a3a06778d59e5cf024161 100644 (file)
@@ -12900,8 +12900,7 @@ static int nl80211_vendor_check_policy(const struct wiphy_vendor_command *vcmd,
                return -EINVAL;
        }
 
-       return nl80211_validate_nested(attr, vcmd->maxattr, vcmd->policy,
-                                      extack);
+       return nla_validate_nested(attr, vcmd->maxattr, vcmd->policy, extack);
 }
 
 static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)