aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Carlos Cobo Rus <luisca@cozybit.com>2007-05-25 23:12:19 -0400
committerJohn W. Linville <linville@tuxdriver.com>2007-06-11 14:28:45 -0400
commit7d8d28b31d16875f868889264efbba1f6c516860 (patch)
tree2386f11d83b78bd93f9fdb2258abe8e986d1799d
parentf5e05b697d2105e5c3f9d837046a8c33ee5b7e14 (diff)
[PATCH] libertas: support for mesh autostart on firmware 5.220.11
Signed-off-by: Luis Carlos Cobo Rus <luisca@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/cmdresp.c10
-rw-r--r--drivers/net/wireless/libertas/host.h1
-rw-r--r--drivers/net/wireless/libertas/main.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index c0c04711196f..3b069341f35f 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -1009,6 +1009,16 @@ int libertas_process_event(wlan_private * priv)
1009 lbs_pr_alert( "EVENT: SNR_HIGH\n"); 1009 lbs_pr_alert( "EVENT: SNR_HIGH\n");
1010 break; 1010 break;
1011 1011
1012 case MACREG_INT_CODE_MESH_AUTO_STARTED:
1013 lbs_pr_alert( "EVENT: MESH_AUTO_STARTED\n");
1014 adapter->connect_status = libertas_connected ;
1015 if (priv->mesh_open == 1) {
1016 netif_wake_queue(priv->mesh_dev) ;
1017 netif_carrier_on(priv->mesh_dev) ;
1018 }
1019 adapter->mode = IW_MODE_ADHOC ;
1020 break;
1021
1012 default: 1022 default:
1013 lbs_pr_alert( "EVENT: unknown event id: %#x\n", 1023 lbs_pr_alert( "EVENT: unknown event id: %#x\n",
1014 eventcause >> SBI_EVENT_CAUSE_SHIFT); 1024 eventcause >> SBI_EVENT_CAUSE_SHIFT);
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index e12dbc65accc..cedf1dbab050 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -336,5 +336,6 @@ enum cmd_mesh_access_opts {
336#define MACREG_INT_CODE_MAX_FAIL 0x0000001b 336#define MACREG_INT_CODE_MAX_FAIL 0x0000001b
337#define MACREG_INT_CODE_RSSI_HIGH 0x0000001c 337#define MACREG_INT_CODE_RSSI_HIGH 0x0000001c
338#define MACREG_INT_CODE_SNR_HIGH 0x0000001d 338#define MACREG_INT_CODE_SNR_HIGH 0x0000001d
339#define MACREG_INT_CODE_MESH_AUTO_STARTED 0x00000023
339 340
340#endif /* _HOST_H_ */ 341#endif /* _HOST_H_ */
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 61cf95b73430..072eeebfdcd1 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -21,7 +21,7 @@
21#include "debugfs.h" 21#include "debugfs.h"
22#include "assoc.h" 22#include "assoc.h"
23 23
24#define DRIVER_RELEASE_VERSION "321.p0" 24#define DRIVER_RELEASE_VERSION "322.p0"
25const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION 25const char libertas_driver_version[] = "COMM-USB8388-" DRIVER_RELEASE_VERSION
26#ifdef DEBUG 26#ifdef DEBUG
27 "-dbg" 27 "-dbg"