diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:34 -0500 |
| commit | 852ad5e631967ae2203cb08c5b6b42c26011ed63 (patch) | |
| tree | 09ff43c85794f466b2c5868a611613088fb68a23 /net/bridge/netfilter/ebtable_nat.c | |
| parent | bnx2x: cleanup skb_set_hash (diff) | |
| parent | bridge: change the position of '{' to the pre line (diff) | |
| download | linux-dev-852ad5e631967ae2203cb08c5b6b42c26011ed63.tar.xz linux-dev-852ad5e631967ae2203cb08c5b6b42c26011ed63.zip | |
Merge branch 'bridge_cleanups'
Tan Xiaojun says:
====================
bridge: cleanup and fix checkpatch errors
Clean up and fix some checkpatch errors in bridge driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to 'net/bridge/netfilter/ebtable_nat.c')
| -rw-r--r-- | net/bridge/netfilter/ebtable_nat.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c index bd238f1f105b..a0ac2984fb6c 100644 --- a/net/bridge/netfilter/ebtable_nat.c +++ b/net/bridge/netfilter/ebtable_nat.c @@ -14,8 +14,7 @@ #define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \ (1 << NF_BR_POST_ROUTING)) -static struct ebt_entries initial_chains[] = -{ +static struct ebt_entries initial_chains[] = { { .name = "PREROUTING", .policy = EBT_ACCEPT, @@ -30,8 +29,7 @@ static struct ebt_entries initial_chains[] = } }; -static struct ebt_replace_kernel initial_table = -{ +static struct ebt_replace_kernel initial_table = { .name = "nat", .valid_hooks = NAT_VALID_HOOKS, .entries_size = 3 * sizeof(struct ebt_entries), @@ -50,8 +48,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks) return 0; } -static struct ebt_table frame_nat = -{ +static struct ebt_table frame_nat = { .name = "nat", .table = &initial_table, .valid_hooks = NAT_VALID_HOOKS, |