diff --git a/[refs] b/[refs]
index 8929d318f055..4ae9bd853aed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca4033024858fcbd392465ba9cbf4c838aedfb58
+refs/heads/master: 196433c5b788eb732fdcf92449274e302f089ce4
diff --git a/trunk/net/ipv6/mcast.c b/trunk/net/ipv6/mcast.c
index f829a4ad3ccc..1cf305a9f8dd 100644
--- a/trunk/net/ipv6/mcast.c
+++ b/trunk/net/ipv6/mcast.c
@@ -224,7 +224,7 @@ int ipv6_sock_mc_join(struct sock *sk, int ifindex, struct in6_addr *addr)
 
 	mc_lst->ifindex = dev->ifindex;
 	mc_lst->sfmode = MCAST_EXCLUDE;
-	mc_lst->sflock = RW_LOCK_UNLOCKED;
+	rwlock_init(&mc_lst->sflock);
 	mc_lst->sflist = NULL;
 
 	/*