Merge tag 'v5.19-rockchip-drivers2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / include / net / ip6_fib.h

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 40ae8f1b18e502cece9f11b3a60c9cc30c2e1a5e..6268963d959942aa1493f7bf21706636414e5a7f 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -190,14 +190,16 @@ struct fib6_info {
        u32                             fib6_metric;
        u8                              fib6_protocol;
        u8                              fib6_type;
+
+       u8                              offload;
+       u8                              trap;
+       u8                              offload_failed;
+
        u8                              should_flush:1,
                                        dst_nocount:1,
                                        dst_nopolicy:1,
                                        fib6_destroying:1,
-                                       offload:1,
-                                       trap:1,
-                                       offload_failed:1,
-                                       unused:1;
+                                       unused:4;
 
        struct rcu_head                 rcu;
        struct nexthop                  *nh;
@@ -367,9 +369,8 @@ struct rt6_statistics {
        __u32           fib_rt_cache;           /* cached rt entries in exception table */
        __u32           fib_discarded_routes;   /* total number of routes delete */
 
-       /* The following stats are not protected by any lock */
+       /* The following stat is not protected by any lock */
        atomic_t        fib_rt_alloc;           /* total number of routes alloced */
-       atomic_t        fib_rt_uncache;         /* rt entries in uncached list */
 };
 
 #define RTN_TL_ROOT    0x0001