Commit 9acd9f3a authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki
Browse files

[IPV6]: Make address arguments const. 



- net/ipv6/addrconf.c:
	ipv6_get_ifaddr(), ipv6_dev_get_saddr()
- net/ipv6/mcast.c:
	ipv6_sock_mc_join(), ipv6_sock_mc_drop(),
	inet6_mc_check(),
	ipv6_dev_mc_inc(), __ipv6_dev_mc_dec(), ipv6_dev_mc_dec(),
	ipv6_chk_mcast_addr()
- net/ipv6/route.c:
	rt6_lookup(), icmp6_dst_alloc()
- net/ipv6/ip6_output.c:
	ip6_nd_hdr()
- net/ipv6/ndisc.c:
	ndisc_send_ns(), ndisc_send_rs(), ndisc_send_redirect(),
	ndisc_get_neigh(), __ndisc_send()

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
parent dfd982ba

include/net/addrconf.h

+15 −13
Original line number Diff line number Diff line
@@ -76,12 +76,12 @@ extern int ipv6_chk_prefix(struct in6_addr *addr, 
						struct net_device *dev);



extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,

						 struct in6_addr *addr,

						 const struct in6_addr *addr,

						 struct net_device *dev,

						 int strict);



extern int			ipv6_dev_get_saddr(struct net_device *dev, 

					       struct in6_addr *daddr,

					       const struct in6_addr *daddr,

					       unsigned int srcprefs,

					       struct in6_addr *saddr);

extern int			ipv6_get_lladdr(struct net_device *dev,
@@ -106,24 +106,26 @@ extern u32 ipv6_addr_label(const struct in6_addr *addr, 
 *	multicast prototypes (mcast.c)

 */

extern int ipv6_sock_mc_join(struct sock *sk, int ifindex,

		  struct in6_addr *addr);

			     const struct in6_addr *addr);

extern int ipv6_sock_mc_drop(struct sock *sk, int ifindex,

		  struct in6_addr *addr);

			     const struct in6_addr *addr);

extern void ipv6_sock_mc_close(struct sock *sk);

extern int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,

		struct in6_addr *src_addr);

extern int inet6_mc_check(struct sock *sk,

			  const struct in6_addr *mc_addr,

			  const struct in6_addr *src_addr);



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

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

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

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

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

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

extern void ipv6_mc_up(struct inet6_dev *idev);

extern void ipv6_mc_down(struct inet6_dev *idev);

extern void ipv6_mc_init_dev(struct inet6_dev *idev);

extern void ipv6_mc_destroy_dev(struct inet6_dev *idev);

extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);



extern int ipv6_chk_mcast_addr(struct net_device *dev, struct in6_addr *group,

		struct in6_addr *src_addr);

extern int ipv6_chk_mcast_addr(struct net_device *dev,

			       const struct in6_addr *group,

			       const struct in6_addr *src_addr);

extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr);



extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len);

include/net/ip6_route.h

+3 −3
Original line number Diff line number Diff line
@@ -61,13 +61,13 @@ extern int ip6_ins_rt(struct rt6_info *); 
extern int			ip6_del_rt(struct rt6_info *);



extern struct rt6_info		*rt6_lookup(struct net *net,

					    struct in6_addr *daddr,

					    struct in6_addr *saddr,

					    const struct in6_addr *daddr,

					    const struct in6_addr *saddr,

					    int oif, int flags);



extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,

					 struct neighbour *neigh,

					 struct in6_addr *addr);

					 const struct in6_addr *addr);

extern int icmp6_dst_gc(int *more);



extern void fib6_force_start_gc(struct net *net);

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -451,8 +451,8 @@ extern int ip6_xmit(struct sock *sk, 
extern int			ip6_nd_hdr(struct sock *sk,

					   struct sk_buff *skb,

					   struct net_device *dev,

					   struct in6_addr *saddr,

					   struct in6_addr *daddr,

					   const struct in6_addr *saddr,

					   const struct in6_addr *daddr,

					   int proto, int len);



extern int			ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr);

include/net/ndisc.h

+7 −7
Original line number Diff line number Diff line
@@ -94,17 +94,17 @@ extern int ndisc_rcv(struct sk_buff *skb); 


extern void			ndisc_send_ns(struct net_device *dev,

					      struct neighbour *neigh,

					      struct in6_addr *solicit,

					      struct in6_addr *daddr,

					      struct in6_addr *saddr);

					      const struct in6_addr *solicit,

					      const struct in6_addr *daddr,

					      const struct in6_addr *saddr);



extern void			ndisc_send_rs(struct net_device *dev,

					      struct in6_addr *saddr,

					      struct in6_addr *daddr);

					      const struct in6_addr *saddr,

					      const struct in6_addr *daddr);



extern void			ndisc_send_redirect(struct sk_buff *skb,

						    struct neighbour *neigh,

						    struct in6_addr *target);

						    const struct in6_addr *target);



extern int			ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir);
@@ -134,7 +134,7 @@ extern int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, 
extern void 			inet6_ifinfo_notify(int event,

						    struct inet6_dev *idev);



static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, struct in6_addr *addr)

static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const struct in6_addr *addr)

{



	if (dev)

net/ipv6/addrconf.c

+3 −3
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ struct ipv6_saddr_score { 
};



struct ipv6_saddr_dst {

	struct in6_addr *addr;

	const struct in6_addr *addr;

	int ifindex;

	int scope;

	int label;
@@ -1074,7 +1074,7 @@ out: 
}



int ipv6_dev_get_saddr(struct net_device *dst_dev,

		       struct in6_addr *daddr, unsigned int prefs,

		       const struct in6_addr *daddr, unsigned int prefs,

		       struct in6_addr *saddr)

{

	struct ipv6_saddr_score scores[2],
@@ -1309,7 +1309,7 @@ int ipv6_chk_prefix(struct in6_addr *addr, struct net_device *dev) 


EXPORT_SYMBOL(ipv6_chk_prefix);



struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, struct in6_addr *addr,

struct inet6_ifaddr *ipv6_get_ifaddr(struct net *net, const struct in6_addr *addr,

				     struct net_device *dev, int strict)

{

	struct inet6_ifaddr * ifp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE