diff options
| author |   Dan Carpenter <error27@gmail.com> | 2010-03-06 01:14:09 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-03-07 15:25:49 -0800 |
| commit | 02a780c014c40973cbe71d04cec7a24e6629995f (patch) | |
| tree | 5a0004b13951be93d5e4f1d622d6431ba031293a /net/bridge | |
| parent | fix a race in ks8695_poll (diff) | |
| download | linux-dev-02a780c014c40973cbe71d04cec7a24e6629995f.tar.xz linux-dev-02a780c014c40973cbe71d04cec7a24e6629995f.zip | |
bridge: cleanup: remove unneed check
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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 2559fb539836..8b258872eba8 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 < |