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/br_forward.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/br_forward.c')
| -rw-r--r-- | net/bridge/br_forward.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 96866aaf3f71..d3409e6b5453 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -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) |