Commit ef7c79ed authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETLINK]: Mark netlink policies const 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14a49e1f

include/net/fib_rules.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct fib_rules_ops 
	void			(*flush_cache)(void);



	int			nlgroup;

	struct nla_policy	*policy;

	const struct nla_policy	*policy;

	struct list_head	*rules_list;

	struct module		*owner;

};

include/net/genetlink.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct genl_ops 
{

	u8			cmd;

	unsigned int		flags;

	struct nla_policy	*policy;

	const struct nla_policy	*policy;

	int		       (*doit)(struct sk_buff *skb,

				       struct genl_info *info);

	int		       (*dumpit)(struct sk_buff *skb,

include/net/ip_fib.h

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ extern void fib_select_default(const struct flowi *flp, struct fib_result *res); 
#endif /* CONFIG_IP_MULTIPLE_TABLES */



/* Exported by fib_frontend.c */

extern struct nla_policy rtm_ipv4_policy[];

extern const struct nla_policy rtm_ipv4_policy[];

extern void		ip_fib_init(void);

extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,

			       struct net_device *dev, __be32 *spec_dst, u32 *itag);

include/net/netlink.h

+6 −6
Original line number Diff line number Diff line
@@ -222,10 +222,10 @@ extern int nlmsg_notify(struct sock *sk, struct sk_buff *skb, 
				     gfp_t flags);



extern int		nla_validate(struct nlattr *head, int len, int maxtype,

				     struct nla_policy *policy);

				     const struct nla_policy *policy);

extern int		nla_parse(struct nlattr *tb[], int maxtype,

				  struct nlattr *head, int len,

				  struct nla_policy *policy);

				  const struct nla_policy *policy);

extern struct nlattr *	nla_find(struct nlattr *head, int len, int attrtype);

extern size_t		nla_strlcpy(char *dst, const struct nlattr *nla,

				    size_t dstsize);
@@ -360,7 +360,7 @@ static inline struct nlmsghdr *nlmsg_next(struct nlmsghdr *nlh, int *remaining) 
 */

static inline int nlmsg_parse(struct nlmsghdr *nlh, int hdrlen,

			      struct nlattr *tb[], int maxtype,

			      struct nla_policy *policy)

			      const struct nla_policy *policy)

{

	if (nlh->nlmsg_len < nlmsg_msg_size(hdrlen))

		return -EINVAL;
@@ -392,7 +392,7 @@ static inline struct nlattr *nlmsg_find_attr(struct nlmsghdr *nlh, 
 * @policy: validation policy

 */

static inline int nlmsg_validate(struct nlmsghdr *nlh, int hdrlen, int maxtype,

				 struct nla_policy *policy)

				 const struct nla_policy *policy)

{

	if (nlh->nlmsg_len < nlmsg_msg_size(hdrlen))

		return -EINVAL;
@@ -729,7 +729,7 @@ static inline struct nlattr *nla_find_nested(struct nlattr *nla, int attrtype) 
 */

static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,

				   struct nlattr *nla,

				   struct nla_policy *policy)

				   const struct nla_policy *policy)

{

	return nla_parse(tb, maxtype, nla_data(nla), nla_len(nla), policy);

}
@@ -990,7 +990,7 @@ static inline int nla_nest_cancel(struct sk_buff *skb, struct nlattr *start) 
 * Returns 0 on success or a negative error code.

 */

static inline int nla_validate_nested(struct nlattr *start, int maxtype,

				      struct nla_policy *policy)

				      const struct nla_policy *policy)

{

	return nla_validate(nla_data(start), nla_len(start), maxtype, policy);

}

net/core/neighbour.c

+2 −2
Original line number Diff line number Diff line
@@ -1761,7 +1761,7 @@ static inline struct neigh_parms *lookup_neigh_params(struct neigh_table *tbl, 
	return NULL;

}



static struct nla_policy nl_neightbl_policy[NDTA_MAX+1] __read_mostly = {

static const struct nla_policy nl_neightbl_policy[NDTA_MAX+1] = {

	[NDTA_NAME]		= { .type = NLA_STRING },

	[NDTA_THRESH1]		= { .type = NLA_U32 },

	[NDTA_THRESH2]		= { .type = NLA_U32 },
@@ -1770,7 +1770,7 @@ static struct nla_policy nl_neightbl_policy[NDTA_MAX+1] __read_mostly = { 
	[NDTA_PARMS]		= { .type = NLA_NESTED },

};



static struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] __read_mostly = {

static const struct nla_policy nl_ntbl_parm_policy[NDTPA_MAX+1] = {

	[NDTPA_IFINDEX]			= { .type = NLA_U32 },

	[NDTPA_QUEUE_LEN]		= { .type = NLA_U32 },

	[NDTPA_PROXY_QLEN]		= { .type = NLA_U32 },