Merge git://git.infradead.org/users/eparis/audit

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

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 02ef772..76d5427 100644 (file)
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -66,11 +66,10 @@ struct inet6_ifaddr {
        struct hlist_node       addr_lst;
        struct list_head        if_list;
 
-#ifdef CONFIG_IPV6_PRIVACY
        struct list_head        tmp_list;
        struct inet6_ifaddr     *ifpub;
        int                     regen_count;
-#endif
+
        bool                    tokenized;
 
        struct rcu_head         rcu;
@@ -192,11 +191,9 @@ struct inet6_dev {
        __u32                   if_flags;
        int                     dead;
 
-#ifdef CONFIG_IPV6_PRIVACY
        u8                      rndid[8];
        struct timer_list       regen_timer;
        struct list_head        tempaddr_list;
-#endif
 
        struct in6_addr         token;