netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ian Morris <ipm@chirality.org.uk>
To: netdev@vger.kernel.org
Cc: Ian Morris <ipm@chirality.org.uk>
Subject: [PATCH net-next 3/6] ipv6: netfilter: remove unnecessary braces
Date: Sat, 25 Apr 2015 10:26:57 +0100	[thread overview]
Message-ID: <1429954020-11763-4-git-send-email-ipm@chirality.org.uk> (raw)
In-Reply-To: <1429954020-11763-1-git-send-email-ipm@chirality.org.uk>

Remove braces from a few if statements where not required.

No changes detected by objdiff.

Signed-off-by: Ian Morris <ipm@chirality.org.uk>
---
 net/ipv6/netfilter/ip6_tables.c         | 3 +--
 net/ipv6/netfilter/nf_conntrack_reasm.c | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 82d53d5..1f8a503 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -151,9 +151,8 @@ ip6_packet_match(const struct sk_buff *skb,
 				ip6info->proto);
 
 		if (ip6info->proto == protohdr) {
-			if (ip6info->invflags & IP6T_INV_PROTO) {
+			if (ip6info->invflags & IP6T_INV_PROTO)
 				return false;
-			}
 			return true;
 		}
 
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 07d8534..a7f6977 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -527,9 +527,9 @@ find_prev_fhdr(struct sk_buff *skb, u8 *prevhdrp, int *prevhoff, int *fhoff)
 		struct ipv6_opt_hdr hdr;
 		int hdrlen;
 
-		if (!ipv6_ext_hdr(nexthdr)) {
+		if (!ipv6_ext_hdr(nexthdr))
 			return -1;
-		}
+
 		if (nexthdr == NEXTHDR_NONE) {
 			pr_debug("next header is none\n");
 			return -1;
-- 
1.9.1

  parent reply	other threads:[~2015-04-25  9:27 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-25  9:26 [PATCH net-next 0/6] ipv6: netfilter - coding style improvements Ian Morris
2015-04-25  9:26 ` [PATCH net-next 1/6] ipv6: netfilter: Tidy up indenting Ian Morris
2015-04-25  9:26 ` [PATCH net-next 2/6] ipv6: netfilter: whitespace in line layouts Ian Morris
2015-04-25 15:57   ` Joe Perches
2015-04-25  9:26 ` Ian Morris [this message]
2015-04-25 15:59   ` [PATCH net-next 3/6] ipv6: netfilter: remove unnecessary braces Joe Perches
2015-04-25 16:54     ` Sergei Shtylyov
2015-04-25 17:01       ` Joe Perches
2015-04-25  9:26 ` [PATCH net-next 4/6] ipv6: netfilter: comparison for equality with NULL Ian Morris
2015-04-25  9:26 ` [PATCH net-next 5/6] ipv6: netfilter: comparison for inequality " Ian Morris
2015-04-25  9:27 ` [PATCH net-next 6/6] ipv6: netfilter: simply if-else statements Ian Morris
2015-04-25 16:17   ` Joe Perches
2015-04-27  2:43 ` [PATCH net-next 0/6] ipv6: netfilter - coding style improvements Pablo Neira Ayuso

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=1429954020-11763-4-git-send-email-ipm@chirality.org.uk \
    --to=ipm@chirality.org.uk \
    --cc=netdev@vger.kernel.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).