1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 93bf63bad0f6..c43b2725e5bc 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -968,6 +968,11 @@ int libertas_process_event(wlan_private * priv)
                 break;
 
         case MACREG_INT_CODE_MESH_AUTO_STARTED:
+                /* Ignore spurious autostart events if autostart is disabled */
+                if (!priv->mesh_autostart_enabled) {
+                        lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n");
+                        break;
+                }
                 lbs_pr_info("EVENT: MESH_AUTO_STARTED\n");
                 adapter->connect_status = LIBERTAS_CONNECTED;
                 if (priv->mesh_open == 1) {