diff options
author | tanxiaojun <tanxiaojun@huawei.com> | 2013-12-19 00:28:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:26 -0500 |
commit | a97bfc1d1f2b4496d01fda34fc546451f1c02bf5 (patch) | |
tree | b631d1e0ca714bd7e39dbf005b85e183c73d024d /net/bridge | |
parent | 87e823b3d5c99a17b4a5cfd6a70cd002992e30dd (diff) |
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>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_forward.c | 4 | ||||
-rw-r--r-- | net/bridge/netfilter/ebtables.c | 2 |
2 files changed, 3 insertions, 3 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, | |||
30 | static inline int should_deliver(const struct net_bridge_port *p, | 30 | static inline int should_deliver(const struct net_bridge_port *p, |
31 | const struct sk_buff *skb) | 31 | const struct sk_buff *skb) |
32 | { | 32 | { |
33 | return (((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) && | 33 | return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) && |
34 | br_allowed_egress(p->br, nbp_get_vlan_info(p), skb) && | 34 | br_allowed_egress(p->br, nbp_get_vlan_info(p), skb) && |
35 | p->state == BR_STATE_FORWARDING); | 35 | p->state == BR_STATE_FORWARDING; |
36 | } | 36 | } |
37 | 37 | ||
38 | static inline unsigned int packet_length(const struct sk_buff *skb) | 38 | static inline unsigned int packet_length(const struct sk_buff *skb) |
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index ac7802428384..09d16d76e4c8 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c | |||
@@ -118,7 +118,7 @@ ebt_dev_check(const char *entry, const struct net_device *device) | |||
118 | /* 1 is the wildcard token */ | 118 | /* 1 is the wildcard token */ |
119 | while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i]) | 119 | while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i]) |
120 | i++; | 120 | i++; |
121 | return (devname[i] != entry[i] && entry[i] != 1); | 121 | return devname[i] != entry[i] && entry[i] != 1; |
122 | } | 122 | } |
123 | 123 | ||
124 | #define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg)) | 124 | #define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg)) |