OSDN Git Service

bridge: remove unnecessary parentheses
authortanxiaojun <tanxiaojun@huawei.com>
Thu, 19 Dec 2013 05:28:11 +0000 (13:28 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Dec 2013 00:27:26 +0000 (19:27 -0500)
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>
net/bridge/br_forward.c
net/bridge/netfilter/ebtables.c

index 96866aa..d3409e6 100644 (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,
                                 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)
index ac78024..09d16d7 100644 (file)
@@ -118,7 +118,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
        /* 1 is the wildcard token */
        while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[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))