OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: remove unnecessary parentheses 

Return is not a function, parentheses are not required.

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:11 +08:00 committed by David S. Miller
parent 87e823b3d5
commit a97bfc1d1f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_forward.c
View File

@ -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, static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb) 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) && 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) static inline unsigned int packet_length(const struct sk_buff *skb)

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

@ -118,7 +118,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
/* 1 is the wildcard token */ /* 1 is the wildcard token */
while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i]) while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])
i++; i++;
return (devname[i] != entry[i] && entry[i] != 1); return devname[i] != entry[i] && entry[i] != 1;
} }
#define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg)) #define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg))