Patchwork ebtables: remove unneeded initializations

login
register
mail settings
Submitter stephen hemminger
Date Feb. 9, 2009, 4:24 p.m.
Message ID <20090209082419.064bb842@extreme>
Download mbox | patch
Permalink /patch/22741/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

stephen hemminger - Feb. 9, 2009, 4:24 p.m.
The initialization of the lock element is not needed
since the lock is always initialized in ebt_register_table.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

---
 net/bridge/netfilter/ebtable_broute.c |    1 -
 net/bridge/netfilter/ebtable_filter.c |    1 -
 net/bridge/netfilter/ebtable_nat.c    |    1 -
 3 files changed, 3 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Patrick McHardy - Feb. 9, 2009, 4:30 p.m.
Stephen Hemminger wrote:
> The initialization of the lock element is not needed
> since the lock is always initialized in ebt_register_table.

Also applied, thanks. I'll push out my current tree now, should be
on kernel.org in a few minutes.



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/net/bridge/netfilter/ebtable_broute.c	2009-02-02 15:06:29.824499691 -0800
+++ b/net/bridge/netfilter/ebtable_broute.c	2009-02-02 15:06:39.925749434 -0800
@@ -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,
 };
--- a/net/bridge/netfilter/ebtable_filter.c	2009-02-02 15:06:29.800254518 -0800
+++ b/net/bridge/netfilter/ebtable_filter.c	2009-02-02 15:06:39.925749434 -0800
@@ -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,
 };
--- a/net/bridge/netfilter/ebtable_nat.c	2009-02-02 15:06:29.808250256 -0800
+++ b/net/bridge/netfilter/ebtable_nat.c	2009-02-02 15:06:39.925749434 -0800
@@ -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,
 };