From c3c0bfa2d3c97f47559ce6c9a28a54a32ee51d6e Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Wed, 4 Jan 2006 13:56:31 -0800
Subject: [PATCH] --- yaml --- r: 15594 b: refs/heads/master c:
 196433c5b788eb732fdcf92449274e302f089ce4 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/mcast.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 
 	/*