From patchwork Mon Aug 15 11:25:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1067102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7FBRoFD005143 for ; Mon, 15 Aug 2011 11:27:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752090Ab1HOL1r (ORCPT ); Mon, 15 Aug 2011 07:27:47 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:61096 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008Ab1HOL1q (ORCPT ); Mon, 15 Aug 2011 07:27:46 -0400 Received: by pzk37 with SMTP id 37so2745665pzk.1 for ; Mon, 15 Aug 2011 04:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=wZObyAUMsS/RUkljlNRLhZbg+zv8elzdK1dAZZjmXDM=; b=eOamtK50QhCpIWAF8sWSwayC8wL4sDMCz4Pt5sns4n9wiPve/PB0cQ4CMlN8+PSyD3 TiUdwdc5/8zRTfYn9GCWZMnG6kb8CrW+fGZxrtdMTHklrsaGFPh3iHHQhsctZwmWj51r 2bWxhy3zFk8SmIGXUOGwgog+8bzCi9sy2PAbQ= Received: by 10.142.12.1 with SMTP id 1mr448879wfl.17.1313407665772; Mon, 15 Aug 2011 04:27:45 -0700 (PDT) Received: from shale.localdomain ([41.139.221.94]) by mx.google.com with ESMTPS id i8sm876734pbi.12.2011.08.15.04.27.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Aug 2011 04:27:44 -0700 (PDT) Date: Mon, 15 Aug 2011 14:25:35 +0300 From: Dan Carpenter To: Dan Williams , Daniel Drake Cc: "John W. Linville" , "open list:MARVELL LIBERTAS..." , "open list:NETWORKING [WIREL..." , kernel-janitors@vger.kernel.org Subject: [patch -next] libertas: handle mesh networks in lbs_iface_active() Message-ID: <20110815112535.GC10560@shale.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 15 Aug 2011 11:27:51 +0000 (UTC) There was an extra semicolon so the if condition wasn't used. We checked "priv->dev" twice instead of "priv->mesh_dev". Signed-off-by: Dan Carpenter Acked-by: Dan Williams --- Compile tested only. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 8148389..b9ff0dc 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h @@ -190,8 +190,8 @@ static inline int lbs_iface_active(struct lbs_private *priv) int r; r = netif_running(priv->dev); - if (priv->mesh_dev); - r |= netif_running(priv->dev); + if (priv->mesh_dev) + r |= netif_running(priv->mesh_dev); return r; }