From: Tan Xiaojun <tanxiaojun@huawei.com>
To: <stephen@networkplumber.org>, <davem@davemloft.net>,
<bart.de.schuymer@pandora.be>
Cc: <bridge@lists.linux-foundation.org>, <netdev@vger.kernel.org>
Subject: [PATCH 2/5] bridge: remove unnecessary parentheses
Date: Thu, 19 Dec 2013 13:28:11 +0800 [thread overview]
Message-ID: <1387430894-11220-3-git-send-email-tanxiaojun@huawei.com> (raw)
In-Reply-To: <1387430894-11220-1-git-send-email-tanxiaojun@huawei.com>
Return is not a function, parentheses are not required.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_forward.c | 4 ++--
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 96866aa..d3409e6 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)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index ac78024..09d16d7 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)
/* 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))
--
1.8.0
next prev parent reply other threads:[~2013-12-19 5:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 5:28 [PATCH 0/5] bridge: cleanup and fix checkpatch errors Tan Xiaojun
2013-12-19 5:28 ` [PATCH 1/5] bridge: remove unnecessary condition judgment Tan Xiaojun
2013-12-19 5:28 ` Tan Xiaojun [this message]
2013-12-19 5:28 ` [PATCH 3/5] bridge: add space before '(/{', after ',', etc Tan Xiaojun
2013-12-19 5:28 ` [PATCH 4/5] bridge: change "foo* bar" to "foo *bar" Tan Xiaojun
2013-12-19 5:28 ` [PATCH 5/5] bridge: change the position of '{' to the pre line Tan Xiaojun
2013-12-19 6:59 ` [PATCH 0/5] bridge: cleanup and fix checkpatch errors Tan Xiaojun
2013-12-19 18:41 ` Stephen Hemminger
2013-12-20 0:28 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387430894-11220-3-git-send-email-tanxiaojun@huawei.com \
--to=tanxiaojun@huawei.com \
--cc=bart.de.schuymer@pandora.be \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).