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

[firefly-linux-kernel-4.4.55.git] / include / net / if_inet6.h

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 93563221d29a728e9a8afef579d90f3a3b8587aa..100fb8cec17c0157c331fc12366d22f593368295 100644 (file)
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -71,6 +71,8 @@ struct inet6_ifaddr {
        struct inet6_ifaddr     *ifpub;
        int                     regen_count;
 #endif
+       bool                    tokenized;
+
        struct rcu_head         rcu;
 };
 
@@ -187,6 +189,8 @@ struct inet6_dev {
        struct list_head        tempaddr_list;
 #endif
 
+       struct in6_addr         token;
+
        struct neigh_parms      *nd_parms;
        struct inet6_dev        *next;
        struct ipv6_devconf     cnf;