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>

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2559fb539836fdf78e29387bfe57bad088b8a296..8b258872eba8eb9be15d31ac57fd9368284e9906 100644 (file)
--- 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 <