Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71d1d42 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

inet: constify ip headers and in6_addr 



Add const qualifiers to structs iphdr, ipv6hdr and in6_addr pointers
where possible, to make code intention more obvious.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f8629c5

include/net/addrconf.h

+11 −11
Original line number Diff line number Diff line
@@ -61,16 +61,16 @@ extern int addrconf_set_dstaddr(struct net *net, 
						     void __user *arg);



extern int			ipv6_chk_addr(struct net *net,

					      struct in6_addr *addr,

					      const struct in6_addr *addr,

					      struct net_device *dev,

					      int strict);



#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)

extern int			ipv6_chk_home_addr(struct net *net,

						   struct in6_addr *addr);

						   const struct in6_addr *addr);

#endif



extern int			ipv6_chk_prefix(struct in6_addr *addr,

extern int			ipv6_chk_prefix(const struct in6_addr *addr,

						struct net_device *dev);



extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
@@ -89,9 +89,9 @@ extern int ipv6_get_lladdr(struct net_device *dev, 
extern int 			ipv6_rcv_saddr_equal(const struct sock *sk,

						    const struct sock *sk2);

extern void			addrconf_join_solict(struct net_device *dev,

					struct in6_addr *addr);

					const struct in6_addr *addr);

extern void			addrconf_leave_solict(struct inet6_dev *idev,

					struct in6_addr *addr);

					const struct in6_addr *addr);



static inline unsigned long addrconf_timeout_fixup(u32 timeout,

						    unsigned unit)
@@ -158,15 +158,15 @@ extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len); 
/*

 *	anycast prototypes (anycast.c)

 */

extern int ipv6_sock_ac_join(struct sock *sk,int ifindex,struct in6_addr *addr);

extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex,struct in6_addr *addr);

extern int ipv6_sock_ac_join(struct sock *sk,int ifindex, const struct in6_addr *addr);

extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex, const struct in6_addr *addr);

extern void ipv6_sock_ac_close(struct sock *sk);

extern int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex);

extern int inet6_ac_check(struct sock *sk, const struct in6_addr *addr, int ifindex);



extern int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr);

extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr);

extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);

extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);

extern int ipv6_chk_acast_addr(struct net *net, struct net_device *dev,

			       struct in6_addr *addr);

			       const struct in6_addr *addr);





/* Device notifier */

include/net/if_inet6.h

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ struct inet6_dev { 
	struct rcu_head		rcu;

};



static inline void ipv6_eth_mc_map(struct in6_addr *addr, char *buf)

static inline void ipv6_eth_mc_map(const struct in6_addr *addr, char *buf)

{

	/*

	 *	+-------+-------+-------+-------+-------+-------+
@@ -210,7 +210,7 @@ static inline void ipv6_eth_mc_map(struct in6_addr *addr, char *buf) 
	memcpy(buf + 2, &addr->s6_addr32[3], sizeof(__u32));

}



static inline void ipv6_tr_mc_map(struct in6_addr *addr, char *buf)

static inline void ipv6_tr_mc_map(const struct in6_addr *addr, char *buf)

{

	/* All nodes FF01::1, FF02::1, FF02::1:FFxx:xxxx */

include/net/inetpeer.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create) 
	return inet_getpeer(&daddr, create);

}



static inline struct inet_peer *inet_getpeer_v6(struct in6_addr *v6daddr, int create)

static inline struct inet_peer *inet_getpeer_v6(const struct in6_addr *v6daddr, int create)

{

	struct inetpeer_addr daddr;

include/net/ip6_fib.h

+4 −4
Original line number Diff line number Diff line
@@ -198,12 +198,12 @@ extern struct dst_entry *fib6_rule_lookup(struct net *net, 
						  pol_lookup_t lookup);



extern struct fib6_node		*fib6_lookup(struct fib6_node *root,

					     struct in6_addr *daddr,

					     struct in6_addr *saddr);

					     const struct in6_addr *daddr,

					     const struct in6_addr *saddr);



struct fib6_node		*fib6_locate(struct fib6_node *root,

					     struct in6_addr *daddr, int dst_len,

					     struct in6_addr *saddr, int src_len);

					     const struct in6_addr *daddr, int dst_len,

					     const struct in6_addr *saddr, int src_len);



extern void			fib6_clean_all(struct net *net,

					       int (*func)(struct rt6_info *, void *arg),

include/net/ip6_route.h

+9 −9
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ extern int ip6_del_rt(struct rt6_info *); 


extern int			ip6_route_get_saddr(struct net *net,

						    struct rt6_info *rt,

						    struct in6_addr *daddr,

						    const struct in6_addr *daddr,

						    unsigned int prefs,

						    struct in6_addr *saddr);
@@ -112,9 +112,9 @@ extern int ip6_dst_hoplimit(struct dst_entry *dst); 
 *	support functions for ND

 *

 */

extern struct rt6_info *	rt6_get_dflt_router(struct in6_addr *addr,

extern struct rt6_info *	rt6_get_dflt_router(const struct in6_addr *addr,

						    struct net_device *dev);

extern struct rt6_info *	rt6_add_dflt_router(struct in6_addr *gwaddr,

extern struct rt6_info *	rt6_add_dflt_router(const struct in6_addr *gwaddr,

						    struct net_device *dev,

						    unsigned int pref);
@@ -122,17 +122,17 @@ extern void rt6_purge_dflt_routers(struct net *net); 


extern int			rt6_route_rcv(struct net_device *dev,

					      u8 *opt, int len,

					      struct in6_addr *gwaddr);

					      const struct in6_addr *gwaddr);



extern void			rt6_redirect(struct in6_addr *dest,

					     struct in6_addr *src,

					     struct in6_addr *saddr,

extern void			rt6_redirect(const struct in6_addr *dest,

					     const struct in6_addr *src,

					     const struct in6_addr *saddr,

					     struct neighbour *neigh,

					     u8 *lladdr,

					     int on_link);



extern void			rt6_pmtu_discovery(struct in6_addr *daddr,

						   struct in6_addr *saddr,

extern void			rt6_pmtu_discovery(const struct in6_addr *daddr,

						   const struct in6_addr *saddr,

						   struct net_device *dev,

						   u32 pmtu);