---

yaml --- r: 187951 b: refs/heads/master c: 02a780c h: refs/heads/master i: 187949: 744abe1 187947: 3839857 187943: ae400b9 187935: 53c2a20 v: v3
git-mirror · Mar 7, 2010 · 6ac0450 · 6ac0450
1 parent 2452aae
commit 6ac0450
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b96b894c518bc7399e6b86b635b5e8cd7356a8e9
+refs/heads/master: 02a780c014c40973cbe71d04cec7a24e6629995f
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/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 <