serial: altera-juart: fix NULL device in log message

[cascardo/linux.git] / include / net / ip6_fib.h

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index cf485f9..8eea35d 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -64,7 +64,7 @@ struct fib6_node {
 
        __u16                   fn_bit;         /* bit key */
        __u16                   fn_flags;
-       __u32                   fn_sernum;
+       int                     fn_sernum;
        struct rt6_info         *rr_ptr;
 };
 
@@ -202,15 +202,25 @@ static inline void ip6_rt_put(struct rt6_info *rt)
        dst_release(&rt->dst);
 }
 
-struct fib6_walker_t {
+enum fib6_walk_state {
+#ifdef CONFIG_IPV6_SUBTREES
+       FWS_S,
+#endif
+       FWS_L,
+       FWS_R,
+       FWS_C,
+       FWS_U
+};
+
+struct fib6_walker {
        struct list_head lh;
        struct fib6_node *root, *node;
        struct rt6_info *leaf;
-       unsigned char state;
-       unsigned char prune;
+       enum fib6_walk_state state;
+       bool prune;
        unsigned int skip;
        unsigned int count;
-       int (*func)(struct fib6_walker_t *);
+       int (*func)(struct fib6_walker *);
        void *args;
 };