From 2e011763179fb6dbcbe7410cd038dbe7e7a5fba4 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Mon, 14 Apr 2008 09:56:03 +0200
Subject: [PATCH] --- yaml --- r: 90681 b: refs/heads/master c:
 0718300c06d4b86ca2f4b93084ff3813fc81f5a2 h: refs/heads/master i:   90679:
 0da137e84143cc337ade8cfe623ef6565d50fac0 v: v3

---
 [refs]                                      | 2 +-
 trunk/net/bridge/netfilter/ebtable_broute.c | 2 +-
 trunk/net/bridge/netfilter/ebtable_filter.c | 2 +-
 trunk/net/bridge/netfilter/ebtable_nat.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 33e79d9d7bfd..971d17239dce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 666953df353194bef76086fa3f126241cbac3e3a
+refs/heads/master: 0718300c06d4b86ca2f4b93084ff3813fc81f5a2
diff --git a/trunk/net/bridge/netfilter/ebtable_broute.c b/trunk/net/bridge/netfilter/ebtable_broute.c
index be6f18681053..246626bb0c87 100644
--- a/trunk/net/bridge/netfilter/ebtable_broute.c
+++ b/trunk/net/bridge/netfilter/ebtable_broute.c
@@ -46,7 +46,7 @@ static struct ebt_table broute_table =
 	.name		= "broute",
 	.table		= &initial_table,
 	.valid_hooks	= 1 << NF_BR_BROUTING,
-	.lock		= RW_LOCK_UNLOCKED,
+	.lock		= __RW_LOCK_UNLOCKED(broute_table.lock),
 	.check		= check,
 	.me		= THIS_MODULE,
 };
diff --git a/trunk/net/bridge/netfilter/ebtable_filter.c b/trunk/net/bridge/netfilter/ebtable_filter.c
index fb810908732f..690bc3ab186c 100644
--- a/trunk/net/bridge/netfilter/ebtable_filter.c
+++ b/trunk/net/bridge/netfilter/ebtable_filter.c
@@ -55,7 +55,7 @@ static struct ebt_table frame_filter =
 	.name		= "filter",
 	.table		= &initial_table,
 	.valid_hooks	= FILTER_VALID_HOOKS,
-	.lock		= RW_LOCK_UNLOCKED,
+	.lock		= __RW_LOCK_UNLOCKED(frame_filter.lock),
 	.check		= check,
 	.me		= THIS_MODULE,
 };
diff --git a/trunk/net/bridge/netfilter/ebtable_nat.c b/trunk/net/bridge/netfilter/ebtable_nat.c
index bc712730c54a..5b495fe2d0b6 100644
--- a/trunk/net/bridge/netfilter/ebtable_nat.c
+++ b/trunk/net/bridge/netfilter/ebtable_nat.c
@@ -55,7 +55,7 @@ static struct ebt_table frame_nat =
 	.name		= "nat",
 	.table		= &initial_table,
 	.valid_hooks	= NAT_VALID_HOOKS,
-	.lock		= RW_LOCK_UNLOCKED,
+	.lock		= __RW_LOCK_UNLOCKED(frame_nat.lock),
 	.check		= check,
 	.me		= THIS_MODULE,
 };