Merge branch 'master' of /home/src/linux-2.6/

[linux-2.6] / include / net / if_inet6.h

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index e97a9accb71df31630d5c4d4455ef52bec535991..eb8afe3499a92766245e59c17ab70bfd84da3ffb 100644 (file)
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -24,6 +24,7 @@
 #define IF_RA_MANAGED  0x40
 #define IF_RA_RCVD     0x20
 #define IF_RS_SENT     0x10
+#define IF_READY       0x80000000
 
 /* prefix flags */
 #define IF_PREFIX_ONLINK       0x01
@@ -82,6 +83,7 @@ struct ipv6_mc_socklist
        struct in6_addr         addr;
        int                     ifindex;
        struct ipv6_mc_socklist *next;
+       rwlock_t                sflock;
        unsigned int            sfmode;         /* MCAST_{INCLUDE,EXCLUDE} */
        struct ip6_sf_socklist  *sflist;
 };