[PATCH] libertas: access mesh_dev more carefully

The CF/SDIO firmware doesn't support Mesh, so priv->mesh_dev is
NULL there. Protect all accesses.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index f9799c3b81c2..da47c225e101 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -739,8 +739,10 @@ int libertas_ret_80211_associate(wlan_private * priv,
         netif_carrier_on(priv->dev);
         netif_wake_queue(priv->dev);
 
-        netif_carrier_on(priv->mesh_dev);
-        netif_wake_queue(priv->mesh_dev);
+        if (priv->mesh_dev) {
+                netif_carrier_on(priv->mesh_dev);
+                netif_wake_queue(priv->mesh_dev);
+        }
 
         lbs_deb_join("ASSOC_RESP: Associated \n");
 
@@ -827,8 +829,10 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
         netif_carrier_on(priv->dev);
         netif_wake_queue(priv->dev);
 
-        netif_carrier_on(priv->mesh_dev);
-        netif_wake_queue(priv->mesh_dev);
+        if (priv->mesh_dev) {
+                netif_carrier_on(priv->mesh_dev);
+                netif_wake_queue(priv->mesh_dev);
+        }
 
         memset(&wrqu, 0, sizeof(wrqu));
         memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);