diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2009-12-08 13:44:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-08 13:44:04 -0800 |
| commit | c66f7d2ff87d3276d2a369bb8b88a617b544203a (patch) | |
| tree | 00f298e7a2c5d5f9fac045342cf88007b7338dfe | |
| parent | 3fa84b4a49f4646f9f96d6443d84be7640ef3262 (diff) | |
| parent | 6a115696c36f5e76efd18342af10953f5d8da914 (diff) | |
| download | wpa_supplicant-c66f7d2ff87d3276d2a369bb8b88a617b544203a.tar.gz | |
am 6a115696: driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)
Merge commit '6a115696c36f5e76efd18342af10953f5d8da914' into eclair-plus-aosp
* commit '6a115696c36f5e76efd18342af10953f5d8da914':
driver_wext: Add "HANGED" processing (b/2310372) (DO NOT MERGE)
| -rw-r--r-- | driver_wext.c | 19 | ||||
| -rw-r--r-- | driver_wext.h | 1 |
2 files changed, 17 insertions, 3 deletions
diff --git a/driver_wext.c b/driver_wext.c index c75dd4a..3c50466 100644 --- a/driver_wext.c +++ b/driver_wext.c @@ -84,6 +84,7 @@ struct wpa_driver_wext_data { char mlmedev[IFNAMSIZ + 1]; int scan_complete_events; + int errors; }; @@ -1001,6 +1002,7 @@ void * wpa_driver_wext_init(void *ctx, const char *ifname) drv->mlme_sock = -1; + drv->errors = 0; wpa_driver_wext_finish_drv_init(drv); return drv; @@ -2542,11 +2544,15 @@ static int wpa_driver_priv_driver_cmd(void *priv, char *cmd, char *buf, size_t b else if (os_strcasecmp(cmd, "STOP") == 0) { if ((wpa_driver_wext_get_ifflags(drv, &flags) == 0) && (flags & IFF_UP)) { - wpa_printf(MSG_ERROR, "WEXT: %s when iface is UP", - cmd); + wpa_printf(MSG_ERROR, "WEXT: %s when iface is UP", cmd); wpa_driver_wext_set_ifflags(drv, flags & ~IFF_UP); } } + else if( os_strcasecmp(cmd, "RELOAD") == 0 ) { + wpa_printf(MSG_DEBUG,"Reload command"); + wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "HANGED"); + return ret; + } os_memset(&iwr, 0, sizeof(iwr)); os_strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); @@ -2558,9 +2564,16 @@ static int wpa_driver_priv_driver_cmd(void *priv, char *cmd, char *buf, size_t b perror("ioctl[SIOCSIWPRIV]"); } - if (ret < 0) + if (ret < 0) { wpa_printf(MSG_ERROR, "%s failed", __func__); + drv->errors++; + if (drv->errors > WEXT_NUMBER_SEQUENTIAL_ERRORS) { + drv->errors = 0; + wpa_msg(drv->ctx, MSG_INFO, WPA_EVENT_DRIVER_STATE "HANGED"); + } + } else { + drv->errors = 0; ret = 0; if ((os_strcasecmp(cmd, "RSSI") == 0) || (os_strcasecmp(cmd, "LINKSPEED") == 0) || diff --git a/driver_wext.h b/driver_wext.h index 4804ae5..cdd9246 100644 --- a/driver_wext.h +++ b/driver_wext.h @@ -52,6 +52,7 @@ int wpa_driver_wext_get_version(struct wpa_driver_wext_data *drv); #define WPA_DRIVER_WEXT_WAIT_US 400000 #define MAX_DRV_CMD_SIZE 248 +#define WEXT_NUMBER_SEQUENTIAL_ERRORS 4 #endif #endif /* DRIVER_WEXT_H */ |