Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-block.git] / include / net / addrconf.h

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 3f62b347b04a7bfee96425a173922cbe6d390cb3..1bab88184d3c3e595493466b8a1e2308562dfe0f 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -202,11 +202,11 @@ u32 ipv6_addr_label(struct net *net, const struct in6_addr *addr,
 /*
  *     multicast prototypes (mcast.c)
  */
-static inline int ipv6_mc_may_pull(struct sk_buff *skb,
-                                  unsigned int len)
+static inline bool ipv6_mc_may_pull(struct sk_buff *skb,
+                                   unsigned int len)
 {
        if (skb_transport_offset(skb) + ipv6_transport_len(skb) < len)
-               return 0;
+               return false;
 
        return pskb_may_pull(skb, len);
 }