diff options
author | Dan Williams <dcbw@redhat.com> | 2007-08-02 13:20:12 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:50:16 -0400 |
commit | 5612c0140ac58b51209a24c8fd6a92ceb472aabe (patch) | |
tree | c504651baeba3ab75db5e8a70d88fe5d1034fe2e | |
parent | 81173e34d454c353d9f0a53760609f3b9d30a311 (diff) |
[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>
-rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 5 |
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) | |||
968 | break; | 968 | break; |
969 | 969 | ||
970 | case MACREG_INT_CODE_MESH_AUTO_STARTED: | 970 | case MACREG_INT_CODE_MESH_AUTO_STARTED: |
971 | /* Ignore spurious autostart events if autostart is disabled */ | ||
972 | if (!priv->mesh_autostart_enabled) { | ||
973 | lbs_pr_info("EVENT: MESH_AUTO_STARTED (ignoring)\n"); | ||
974 | break; | ||
975 | } | ||
971 | lbs_pr_info("EVENT: MESH_AUTO_STARTED\n"); | 976 | lbs_pr_info("EVENT: MESH_AUTO_STARTED\n"); |
972 | adapter->connect_status = LIBERTAS_CONNECTED; | 977 | adapter->connect_status = LIBERTAS_CONNECTED; |
973 | if (priv->mesh_open == 1) { | 978 | if (priv->mesh_open == 1) { |