hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bridge: change the position of '{' to the pre line 

That open brace { should be on the previous line.

Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
tanxiaojun 2013-12-19 13:28:14 +08:00 committed by David S. Miller
parent 56b148eb94
commit 97ad8b53e6
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/netfilter/ebtable_broute.c
View File

@ -23,8 +23,7 @@ static struct ebt_entries initial_chain = {
.policy = EBT_ACCEPT, .policy = EBT_ACCEPT,
}; };
static struct ebt_replace_kernel initial_table = static struct ebt_replace_kernel initial_table = {
{
.name = "broute", .name = "broute",
.valid_hooks = 1 << NF_BR_BROUTING, .valid_hooks = 1 << NF_BR_BROUTING,
.entries_size = sizeof(struct ebt_entries), .entries_size = sizeof(struct ebt_entries),
@ -41,8 +40,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0; return 0;
} }
static const struct ebt_table broute_table = static const struct ebt_table broute_table = {
{
.name = "broute", .name = "broute",
.table = &initial_table, .table = &initial_table,
.valid_hooks = 1 << NF_BR_BROUTING, .valid_hooks = 1 << NF_BR_BROUTING,

9
net/bridge/netfilter/ebtable_filter.c
View File

@ -14,8 +14,7 @@
#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \ #define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
(1 << NF_BR_LOCAL_OUT)) (1 << NF_BR_LOCAL_OUT))
static struct ebt_entries initial_chains[] = static struct ebt_entries initial_chains[] = {
{
{ {
.name = "INPUT", .name = "INPUT",
.policy = EBT_ACCEPT, .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 = "filter", .name = "filter",
.valid_hooks = FILTER_VALID_HOOKS, .valid_hooks = FILTER_VALID_HOOKS,
.entries_size = 3 * sizeof(struct ebt_entries), .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; return 0;
} }
static const struct ebt_table frame_filter = static const struct ebt_table frame_filter = {
{
.name = "filter", .name = "filter",
.table = &initial_table, .table = &initial_table,
.valid_hooks = FILTER_VALID_HOOKS, .valid_hooks = FILTER_VALID_HOOKS,

9
net/bridge/netfilter/ebtable_nat.c
View File

@ -14,8 +14,7 @@
#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \ #define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
(1 << NF_BR_POST_ROUTING)) (1 << NF_BR_POST_ROUTING))
static struct ebt_entries initial_chains[] = static struct ebt_entries initial_chains[] = {
{
{ {
.name = "PREROUTING", .name = "PREROUTING",
.policy = EBT_ACCEPT, .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", .name = "nat",
.valid_hooks = NAT_VALID_HOOKS, .valid_hooks = NAT_VALID_HOOKS,
.entries_size = 3 * sizeof(struct ebt_entries), .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; return 0;
} }
static struct ebt_table frame_nat = static struct ebt_table frame_nat = {
{
.name = "nat", .name = "nat",
.table = &initial_table, .table = &initial_table,
.valid_hooks = NAT_VALID_HOOKS, .valid_hooks = NAT_VALID_HOOKS,

3
net/bridge/netfilter/ebtables.c
View File

@ -2375,8 +2375,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
} }
#endif #endif
static struct nf_sockopt_ops ebt_sockopts = static struct nf_sockopt_ops ebt_sockopts = {
{
.pf = PF_INET, .pf = PF_INET,
.set_optmin = EBT_BASE_CTL, .set_optmin = EBT_BASE_CTL,
.set_optmax = EBT_SO_SET_MAX + 1, .set_optmax = EBT_SO_SET_MAX + 1,