diff mbox

[-next] libertas: handle mesh networks in lbs_iface_active()

Message ID 20110815112535.GC10560@shale.localdomain (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Dan Carpenter Aug. 15, 2011, 11:25 a.m. 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 <error27@gmail.com>
---
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

Comments

Dan Williams Aug. 15, 2011, 10:52 p.m. UTC | #1
On Mon, 2011-08-15 at 14:25 +0300, Dan Carpenter wrote:
> 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 <error27@gmail.com>

Acked-by: Dan Williams <dcbw@redhat.com>

> ---
> Compile tested only.
> 
> 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;
>  }


--
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 mbox

Patch

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;
 }