Commit 32d5109a authored by Michal Kubecek's avatar Michal Kubecek Committed by David S. Miller
Browse files

netlink: rename nl80211_validate_nested() to nla_validate_nested() 



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: default avatarMichal Kubecek <mkubecek@suse.cz>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f74877a5

include/net/netlink.h

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +1758,7 @@ static inline int __nla_validate_nested(const struct nlattr *start, int maxtype, 
}



static inline int

nl80211_validate_nested(const struct nlattr *start, int maxtype,

nla_validate_nested(const struct nlattr *start, int maxtype,

		    const struct nla_policy *policy,

		    struct netlink_ext_ack *extack)

{

net/wireless/nl80211.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE