Merge ../ntfs-2.6-devel

[linux-2.6-omap-h63xx.git] / include / net / if_inet6.h

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index d8234f9bd4c418298e9775cf4af01a1e69d27fe4..eb8afe3499a92766245e59c17ab70bfd84da3ffb 100644 (file)
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -83,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;
 };