From 6ac0450c5c010689ebc6374cd50ca6ba5887338f Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 6 Mar 2010 01:14:09 +0000 Subject: [PATCH] --- yaml --- r: 187951 b: refs/heads/master c: 02a780c014c40973cbe71d04cec7a24e6629995f h: refs/heads/master i: 187949: 744abe1307417a47e72d3e76577c93f1cac7927b 187947: 383985730b0b33dbee221da1c274bfbdb0379101 187943: ae400b93c3c4b3919a2ee65f8ee033e3e1bb4f35 187935: 53c2a20627082a40cd0f98422a99f72c4f892c8f v: v3 --- [refs] | 2 +- trunk/net/bridge/br_multicast.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 87f0d531fe2a..47b2eb377b51 100644 --- 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 index 2559fb539836..8b258872eba8 100644 --- 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 <