From 9d9dbc6cf967d36038f4d18a162bdaa4e79afbe6 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 18 Feb 2009 16:30:38 +0100
Subject: [PATCH] --- yaml --- r: 135471 b: refs/heads/master c:
 842bff366b536787b88c07cbf2416e2cb26cae67 h: refs/heads/master i:   135469:
 ca3731d58bb4de3e95a4f9ab1cc10e4723391aa0   135467:
 543a848b7c04c664156cbaf8b9b13ae0a1899077   135463:
 368704f00802058da86cb2b401bf7a1044b02196   135455:
 3536bc19fff29f8f904ff752ce5eb0481bc1e466 v: v3

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

diff --git a/[refs] b/[refs]
index 0144d5cc6418..2bfc5b3ed342 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c8222b9e71b690c8388bb0ebe5c3e5a1469e884
+refs/heads/master: 842bff366b536787b88c07cbf2416e2cb26cae67
diff --git a/trunk/net/bridge/netfilter/ebtable_broute.c b/trunk/net/bridge/netfilter/ebtable_broute.c
index 8604dfc1fc3b..c751111440f8 100644
--- a/trunk/net/bridge/netfilter/ebtable_broute.c
+++ b/trunk/net/bridge/netfilter/ebtable_broute.c
@@ -46,7 +46,6 @@ static struct ebt_table broute_table =
 	.name		= "broute",
 	.table		= &initial_table,
 	.valid_hooks	= 1 << NF_BR_BROUTING,
-	.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 2b2e8040a9c6..a5eea72938a6 100644
--- a/trunk/net/bridge/netfilter/ebtable_filter.c
+++ b/trunk/net/bridge/netfilter/ebtable_filter.c
@@ -55,7 +55,6 @@ static struct ebt_table frame_filter =
 	.name		= "filter",
 	.table		= &initial_table,
 	.valid_hooks	= FILTER_VALID_HOOKS,
-	.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 3fe1ae87e35f..6024c551f9a9 100644
--- a/trunk/net/bridge/netfilter/ebtable_nat.c
+++ b/trunk/net/bridge/netfilter/ebtable_nat.c
@@ -55,7 +55,6 @@ static struct ebt_table frame_nat =
 	.name		= "nat",
 	.table		= &initial_table,
 	.valid_hooks	= NAT_VALID_HOOKS,
-	.lock		= __RW_LOCK_UNLOCKED(frame_nat.lock),
 	.check		= check,
 	.me		= THIS_MODULE,
 };