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

ipv6: bool/const conversions phase2 



Mostly bool conversions, some inline removals and const additions.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32e9072b

include/net/addrconf.h

+9 −9
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ extern int ipv6_sock_mc_join(struct sock *sk, int ifindex, 
extern int ipv6_sock_mc_drop(struct sock *sk, int ifindex,

			     const struct in6_addr *addr);

extern void ipv6_sock_mc_close(struct sock *sk);

extern int inet6_mc_check(struct sock *sk,

extern bool inet6_mc_check(struct sock *sk,

			   const struct in6_addr *mc_addr,

			   const struct in6_addr *src_addr);
@@ -146,10 +146,10 @@ 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,

extern bool 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 bool ipv6_is_mld(struct sk_buff *skb, int nexthdr);



extern void addrconf_prefix_rcv(struct net_device *dev,

				u8 *opt, int len, bool sllao);
@@ -163,7 +163,7 @@ extern void ipv6_sock_ac_close(struct sock *sk); 


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,

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

				const struct in6_addr *addr);

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst, 
	spin_unlock(&sk->sk_dst_lock);

}



static inline int ipv6_unicast_destination(struct sk_buff *skb)

static inline bool ipv6_unicast_destination(const struct sk_buff *skb)

{

	struct rt6_info *rt = (struct rt6_info *) skb_dst(skb);

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ extern void ipv6_push_frag_opts(struct sk_buff *skb, 
extern int			ipv6_skip_exthdr(const struct sk_buff *, int start,

					         u8 *nexthdrp, __be16 *frag_offp);



extern int 			ipv6_ext_hdr(u8 nexthdr);

extern bool			ipv6_ext_hdr(u8 nexthdr);



extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);

include/net/rawv6.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


void raw6_icmp_error(struct sk_buff *, int nexthdr,

		u8 type, u8 code, int inner_offset, __be32);

int raw6_local_deliver(struct sk_buff *, int);

bool raw6_local_deliver(struct sk_buff *, int);



extern int			rawv6_rcv(struct sock *sk,

					  struct sk_buff *skb);

net/ipv6/addrlabel.c

+12 −12
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void ip6addrlbl_free_rcu(struct rcu_head *h) 
	ip6addrlbl_free(container_of(h, struct ip6addrlbl_entry, rcu));

}



static inline int ip6addrlbl_hold(struct ip6addrlbl_entry *p)

static bool ip6addrlbl_hold(struct ip6addrlbl_entry *p)

{

	return atomic_inc_not_zero(&p->refcnt);

}
@@ -141,20 +141,20 @@ static inline void ip6addrlbl_put(struct ip6addrlbl_entry *p) 
}



/* Find label */

static int __ip6addrlbl_match(struct net *net,

			      struct ip6addrlbl_entry *p,

static bool __ip6addrlbl_match(struct net *net,

			       const struct ip6addrlbl_entry *p,

			       const struct in6_addr *addr,

			       int addrtype, int ifindex)

{

	if (!net_eq(ip6addrlbl_net(p), net))

		return 0;

		return false;

	if (p->ifindex && p->ifindex != ifindex)

		return 0;

		return false;

	if (p->addrtype && p->addrtype != addrtype)

		return 0;

		return false;

	if (!ipv6_prefix_equal(addr, &p->prefix, p->prefixlen))

		return 0;

	return 1;

		return false;

	return true;

}



static struct ip6addrlbl_entry *__ipv6_addr_label(struct net *net,
@@ -456,7 +456,7 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh, 
	return err;

}



static inline void ip6addrlbl_putmsg(struct nlmsghdr *nlh,

static void ip6addrlbl_putmsg(struct nlmsghdr *nlh,

			      int prefixlen, int ifindex, u32 lseq)

{

	struct ifaddrlblmsg *ifal = nlmsg_data(nlh);