From: Dan Williams <dcbw@redhat.com>
Date: Thu, 2 Aug 2007 17:20:12 +0000 (-0400)
Subject: [PATCH] libertas: ignore spurious mesh autostart events
X-Git-Tag: v2.6.24-rc1~1454^2~583
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5612c0140ac58b51209a24c8fd6a92ceb472aabe;p=linux-2.6

[PATCH] libertas: ignore spurious mesh autostart events

Don't trust the firmware to always send them at the right time,
ignore them when the driver thinks mesh autostart is disabled.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 93bf63bad0..c43b2725e5 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) {