summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-08-15 14:25:35 +0300
committerJohn W. Linville <linville@tuxdriver.com>2011-08-24 14:41:42 -0400
commitbfe2ed8f4df2e7b6991c4039bb624dee5f8b6583 (patch)
tree86fae19ed49378fe210e5494a27e209943526ac8
parentba2d00e816a11b532e0c035e5cf7b9311e72ac00 (diff)
downloadlinux-bfe2ed8f4df2e7b6991c4039bb624dee5f8b6583.tar.gz
linux-bfe2ed8f4df2e7b6991c4039bb624dee5f8b6583.tar.bz2
linux-bfe2ed8f4df2e7b6991c4039bb624dee5f8b6583.zip
libertas: handle mesh networks in lbs_iface_active()
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> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/dev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 814838916b82..b9ff0dc53e8d 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;
}