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

Commit 852ad5e6 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
parents 5495ab75 97ad8b53

net/bridge/br_fdb.c

+1 −2
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ static void fdb_notify(struct net_bridge *br, 
	rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);

}

net/bridge/br_forward.c

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ static int deliver_clone(const struct net_bridge_port *prev, 
static inline int should_deliver(const struct net_bridge_port *p,

				 const struct sk_buff *skb)

{

	return (((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&

	return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&

		br_allowed_egress(p->br, nbp_get_vlan_info(p), skb) &&

		p->state == BR_STATE_FORWARDING);

		p->state == BR_STATE_FORWARDING;

}



static inline unsigned int packet_length(const struct sk_buff *skb)

net/bridge/br_netlink.c

+1 −2
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port) 
	rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);

	return;

errout:

	if (err < 0)

	rtnl_set_sk_err(net, RTNLGRP_LINK, err);

}

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,