diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-04-22 04:53:02 +0000 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-22 11:04:14 -0700 | 
| commit | b71d1d426d263b0b6cb5760322efebbfc89d4463 (patch) | |
| tree | 226ca7390bd6187ec9139d2ccedd26fd94d8e57a /net/ipv6/route.c | |
| parent | 5f8629c526b4f7e529a6d27bbd802c0dc7fcc357 (diff) | |
| download | linux-b71d1d426d263b0b6cb5760322efebbfc89d4463.tar.bz2 | |
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: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 52 | 
1 files changed, 26 insertions, 26 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index af26cc1073cb..852fc28ca818 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -89,12 +89,12 @@ static void		ip6_rt_update_pmtu(struct dst_entry *dst, u32 mtu);  #ifdef CONFIG_IPV6_ROUTE_INFO  static struct rt6_info *rt6_add_route_info(struct net *net, -					   struct in6_addr *prefix, int prefixlen, -					   struct in6_addr *gwaddr, int ifindex, +					   const struct in6_addr *prefix, int prefixlen, +					   const struct in6_addr *gwaddr, int ifindex,  					   unsigned pref);  static struct rt6_info *rt6_get_route_info(struct net *net, -					   struct in6_addr *prefix, int prefixlen, -					   struct in6_addr *gwaddr, int ifindex); +					   const struct in6_addr *prefix, int prefixlen, +					   const struct in6_addr *gwaddr, int ifindex);  #endif  static u32 *ipv6_cow_metrics(struct dst_entry *dst, unsigned long old) @@ -283,7 +283,7 @@ static __inline__ int rt6_check_expired(const struct rt6_info *rt)  		time_after(jiffies, rt->rt6i_expires);  } -static inline int rt6_need_strict(struct in6_addr *daddr) +static inline int rt6_need_strict(const struct in6_addr *daddr)  {  	return ipv6_addr_type(daddr) &  		(IPV6_ADDR_MULTICAST | IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK); @@ -295,7 +295,7 @@ static inline int rt6_need_strict(struct in6_addr *daddr)  static inline struct rt6_info *rt6_device_match(struct net *net,  						    struct rt6_info *rt, -						    struct in6_addr *saddr, +						    const struct in6_addr *saddr,  						    int oif,  						    int flags)  { @@ -507,7 +507,7 @@ static struct rt6_info *rt6_select(struct fib6_node *fn, int oif, int strict)  #ifdef CONFIG_IPV6_ROUTE_INFO  int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, -		  struct in6_addr *gwaddr) +		  const struct in6_addr *gwaddr)  {  	struct net *net = dev_net(dev);  	struct route_info *rinfo = (struct route_info *) opt; @@ -670,8 +670,8 @@ int ip6_ins_rt(struct rt6_info *rt)  	return __ip6_ins_rt(rt, &info);  } -static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *daddr, -				      struct in6_addr *saddr) +static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, const struct in6_addr *daddr, +				      const struct in6_addr *saddr)  {  	struct rt6_info *rt; @@ -739,7 +739,7 @@ static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *dad  	return rt;  } -static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, struct in6_addr *daddr) +static struct rt6_info *rt6_alloc_clone(struct rt6_info *ort, const struct in6_addr *daddr)  {  	struct rt6_info *rt = ip6_rt_copy(ort);  	if (rt) { @@ -830,7 +830,7 @@ static struct rt6_info *ip6_pol_route_input(struct net *net, struct fib6_table *  void ip6_route_input(struct sk_buff *skb)  { -	struct ipv6hdr *iph = ipv6_hdr(skb); +	const struct ipv6hdr *iph = ipv6_hdr(skb);  	struct net *net = dev_net(skb->dev);  	int flags = RT6_LOOKUP_F_HAS_SADDR;  	struct flowi6 fl6 = { @@ -1272,7 +1272,7 @@ int ip6_route_add(struct fib6_config *cfg)  	}  	if (cfg->fc_flags & RTF_GATEWAY) { -		struct in6_addr *gw_addr; +		const struct in6_addr *gw_addr;  		int gwa_type;  		gw_addr = &cfg->fc_gateway; @@ -1512,9 +1512,9 @@ out:  	return rt;  }; -static struct rt6_info *ip6_route_redirect(struct in6_addr *dest, -					   struct in6_addr *src, -					   struct in6_addr *gateway, +static struct rt6_info *ip6_route_redirect(const struct in6_addr *dest, +					   const struct in6_addr *src, +					   const struct in6_addr *gateway,  					   struct net_device *dev)  {  	int flags = RT6_LOOKUP_F_HAS_SADDR; @@ -1536,8 +1536,8 @@ static struct rt6_info *ip6_route_redirect(struct in6_addr *dest,  						   flags, __ip6_route_redirect);  } -void rt6_redirect(struct in6_addr *dest, struct in6_addr *src, -		  struct in6_addr *saddr, +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)  {  	struct rt6_info *rt, *nrt = NULL; @@ -1611,7 +1611,7 @@ out:   *	i.e. Path MTU discovery   */ -static void rt6_do_pmtu_disc(struct in6_addr *daddr, struct in6_addr *saddr, +static void rt6_do_pmtu_disc(const struct in6_addr *daddr, const struct in6_addr *saddr,  			     struct net *net, u32 pmtu, int ifindex)  {  	struct rt6_info *rt, *nrt; @@ -1696,7 +1696,7 @@ out:  	dst_release(&rt->dst);  } -void rt6_pmtu_discovery(struct in6_addr *daddr, struct in6_addr *saddr, +void rt6_pmtu_discovery(const struct in6_addr *daddr, const struct in6_addr *saddr,  			struct net_device *dev, u32 pmtu)  {  	struct net *net = dev_net(dev); @@ -1756,8 +1756,8 @@ static struct rt6_info * ip6_rt_copy(struct rt6_info *ort)  #ifdef CONFIG_IPV6_ROUTE_INFO  static struct rt6_info *rt6_get_route_info(struct net *net, -					   struct in6_addr *prefix, int prefixlen, -					   struct in6_addr *gwaddr, int ifindex) +					   const struct in6_addr *prefix, int prefixlen, +					   const struct in6_addr *gwaddr, int ifindex)  {  	struct fib6_node *fn;  	struct rt6_info *rt = NULL; @@ -1788,8 +1788,8 @@ out:  }  static struct rt6_info *rt6_add_route_info(struct net *net, -					   struct in6_addr *prefix, int prefixlen, -					   struct in6_addr *gwaddr, int ifindex, +					   const struct in6_addr *prefix, int prefixlen, +					   const struct in6_addr *gwaddr, int ifindex,  					   unsigned pref)  {  	struct fib6_config cfg = { @@ -1817,7 +1817,7 @@ static struct rt6_info *rt6_add_route_info(struct net *net,  }  #endif -struct rt6_info *rt6_get_dflt_router(struct in6_addr *addr, struct net_device *dev) +struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_device *dev)  {  	struct rt6_info *rt;  	struct fib6_table *table; @@ -1839,7 +1839,7 @@ struct rt6_info *rt6_get_dflt_router(struct in6_addr *addr, struct net_device *d  	return rt;  } -struct rt6_info *rt6_add_dflt_router(struct in6_addr *gwaddr, +struct rt6_info *rt6_add_dflt_router(const struct in6_addr *gwaddr,  				     struct net_device *dev,  				     unsigned int pref)  { @@ -2049,7 +2049,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,  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)  {  |