From: Dan Carpenter <error27@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
bridge@lists.linux-foundation.org,
"David S. Miller" <davem@davemloft.net>
Subject: [Bridge] [patch] bridge: cleanup: remove unneed check
Date: Sat, 6 Mar 2010 14:14:09 +0300 [thread overview]
Message-ID: <20100306111408.GJ4958@bicker> (raw)
We dereference "port" on the lines immediately before and immediately
after the test so port should hopefully never be null here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2559fb5..8b25887 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -627,8 +627,8 @@ static void br_multicast_port_query_expired(unsigned long data)
struct net_bridge *br = port->br;
spin_lock(&br->multicast_lock);
- if (port && (port->state == BR_STATE_DISABLED ||
- port->state == BR_STATE_BLOCKING))
+ if (port->state == BR_STATE_DISABLED ||
+ port->state == BR_STATE_BLOCKING)
goto out;
if (port->multicast_startup_queries_sent <
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
bridge@lists.linux-foundation.org,
"David S. Miller" <davem@davemloft.net>
Subject: [patch] bridge: cleanup: remove unneed check
Date: Sat, 06 Mar 2010 11:14:09 +0000 [thread overview]
Message-ID: <20100306111408.GJ4958@bicker> (raw)
We dereference "port" on the lines immediately before and immediately
after the test so port should hopefully never be null here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2559fb5..8b25887 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -627,8 +627,8 @@ static void br_multicast_port_query_expired(unsigned long data)
struct net_bridge *br = port->br;
spin_lock(&br->multicast_lock);
- if (port && (port->state = BR_STATE_DISABLED ||
- port->state = BR_STATE_BLOCKING))
+ if (port->state = BR_STATE_DISABLED ||
+ port->state = BR_STATE_BLOCKING)
goto out;
if (port->multicast_startup_queries_sent <
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <error27@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
bridge@lists.linux-foundation.org,
"David S. Miller" <davem@davemloft.net>
Subject: [patch] bridge: cleanup: remove unneed check
Date: Sat, 6 Mar 2010 14:14:09 +0300 [thread overview]
Message-ID: <20100306111408.GJ4958@bicker> (raw)
We dereference "port" on the lines immediately before and immediately
after the test so port should hopefully never be null here.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2559fb5..8b25887 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -627,8 +627,8 @@ static void br_multicast_port_query_expired(unsigned long data)
struct net_bridge *br = port->br;
spin_lock(&br->multicast_lock);
- if (port && (port->state == BR_STATE_DISABLED ||
- port->state == BR_STATE_BLOCKING))
+ if (port->state == BR_STATE_DISABLED ||
+ port->state == BR_STATE_BLOCKING)
goto out;
if (port->multicast_startup_queries_sent <
next reply other threads:[~2010-03-06 11:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-06 11:14 Dan Carpenter [this message]
2010-03-06 11:14 ` [patch] bridge: cleanup: remove unneed check Dan Carpenter
2010-03-06 11:14 ` Dan Carpenter
2010-03-06 12:20 ` [Bridge] " Herbert Xu
2010-03-06 12:20 ` Herbert Xu
2010-03-07 23:27 ` [Bridge] " David Miller
2010-03-07 23:27 ` David Miller
2010-03-07 23:27 ` 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=20100306111408.GJ4958@bicker \
--to=error27@gmail.com \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kernel-janitors@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.