1 files changed, 7 insertions, 6 deletions

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 545d8b059bef..13f9fc086d54 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -54,16 +54,17 @@ struct inet6_ifaddr {
         struct inet6_dev        *idev;
         struct rt6_info         *rt;
 
-        struct inet6_ifaddr     *lst_next;      /* next addr in addr_lst */
-        struct inet6_ifaddr     *if_next;       /* next addr in inet6_dev */
+        struct hlist_node       addr_lst;
+        struct list_head        if_list;
 
 #ifdef CONFIG_IPV6_PRIVACY
-        struct inet6_ifaddr     *tmp_next;      /* next addr in tempaddr_lst */
+        struct list_head        tmp_list;
         struct inet6_ifaddr     *ifpub;
         int                     regen_count;
 #endif
 
         int                     dead;
+        struct rcu_head         rcu;
 };
 
 struct ip6_sf_socklist {
@@ -151,9 +152,9 @@ struct ipv6_devstat {
 };
 
 struct inet6_dev {
-        struct net_device               *dev;
+        struct net_device       *dev;
 
-        struct inet6_ifaddr     *addr_list;
+        struct list_head        addr_list;
 
         struct ifmcaddr6        *mc_list;
         struct ifmcaddr6        *mc_tomb;
@@ -175,7 +176,7 @@ struct inet6_dev {
 #ifdef CONFIG_IPV6_PRIVACY
         u8                      rndid[8];
         struct timer_list       regen_timer;
-        struct inet6_ifaddr     *tempaddr_list;
+        struct list_head        tempaddr_list;
 #endif
 
         struct neigh_parms      *nd_parms;