summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-08-02 19:20:12 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-11 01:50:16 +0200
commit5612c0140ac58b51209a24c8fd6a92ceb472aabe (patch)
treec504651baeba3ab75db5e8a70d88fe5d1034fe2e /drivers
parent[PATCH] libertas: fix misspelling in debug message (diff)
downloadlinux-5612c0140ac58b51209a24c8fd6a92ceb472aabe.tar.xz
linux-5612c0140ac58b51209a24c8fd6a92ceb472aabe.zip
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/cmdresp.c5
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) {