diff --git a/[refs] b/[refs]
index 1b020d964151..446f35084ef5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81173e34d454c353d9f0a53760609f3b9d30a311
+refs/heads/master: 5612c0140ac58b51209a24c8fd6a92ceb472aabe
diff --git a/trunk/drivers/net/wireless/libertas/cmdresp.c b/trunk/drivers/net/wireless/libertas/cmdresp.c
index 93bf63bad0f6..c43b2725e5bc 100644
--- a/trunk/drivers/net/wireless/libertas/cmdresp.c
+++ b/trunk/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) {