Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97ad8b53 authored by tanxiaojun's avatar tanxiaojun Committed by David S. Miller
Browse files

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



That open brace { should be on the previous line.

Signed-off-by: default avatarTan Xiaojun <tanxiaojun@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56b148eb

net/bridge/netfilter/ebtable_broute.c

+2 −4
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ static struct ebt_entries initial_chain = { 
	.policy		= EBT_ACCEPT,

};



static struct ebt_replace_kernel initial_table =

{

static struct ebt_replace_kernel initial_table = {

	.name		= "broute",

	.valid_hooks	= 1 << NF_BR_BROUTING,

	.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;

}



static const struct ebt_table broute_table =

{

static const struct ebt_table broute_table = {

	.name		= "broute",

	.table		= &initial_table,

	.valid_hooks	= 1 << NF_BR_BROUTING,

net/bridge/netfilter/ebtable_filter.c

+3 −6
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \

   (1 << NF_BR_LOCAL_OUT))



static struct ebt_entries initial_chains[] =

{

static struct ebt_entries initial_chains[] = {

	{

		.name	= "INPUT",

		.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",

	.valid_hooks	= FILTER_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 const struct ebt_table frame_filter =

{

static const struct ebt_table frame_filter = {

	.name		= "filter",

	.table		= &initial_table,

	.valid_hooks	= FILTER_VALID_HOOKS,

net/bridge/netfilter/ebtable_nat.c

+3 −6
Original line number Diff line number Diff line
@@ -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,

net/bridge/netfilter/ebtables.c

+1 −2
Original line number Diff line number Diff line
@@ -2375,8 +2375,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd, 
}

#endif



static struct nf_sockopt_ops ebt_sockopts =

{

static struct nf_sockopt_ops ebt_sockopts = {

	.pf		= PF_INET,

	.set_optmin	= EBT_BASE_CTL,

	.set_optmax	= EBT_SO_SET_MAX + 1,