diff options
-rw-r--r-- | drivers/staging/cw1200/bh.c | 8 | ||||
-rw-r--r-- | drivers/staging/cw1200/wsm.c | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/drivers/staging/cw1200/bh.c b/drivers/staging/cw1200/bh.c index cddfd9dfaa4..1ecae7466f6 100644 --- a/drivers/staging/cw1200/bh.c +++ b/drivers/staging/cw1200/bh.c @@ -270,6 +270,9 @@ static int cw1200_bh(void *arg) && priv->powersave_enabled && !priv->device_can_sleep) status = 1 * HZ; + else if (priv->hw_bufs_used) + /* Interrupt loss detection */ + status = 1 * HZ; else status = MAX_SCHEDULE_TIMEOUT; @@ -284,7 +287,10 @@ static int cw1200_bh(void *arg) if (status < 0 || term) break; - if (!status) { + if (!status && priv->hw_bufs_used) { + wiphy_warn(priv->hw->wiphy, "Missed interrupt?\n"); + rx = 1; + } else if (!status) { bh_printk(KERN_DEBUG "[BH] Device wakedown.\n"); WARN_ON(cw1200_reg_write_16(priv, ST90TDS_CONTROL_REG_ID, 0)); diff --git a/drivers/staging/cw1200/wsm.c b/drivers/staging/cw1200/wsm.c index 1fe5e32a27a..f1ab481984b 100644 --- a/drivers/staging/cw1200/wsm.c +++ b/drivers/staging/cw1200/wsm.c @@ -27,10 +27,10 @@ #define wsm_printk(...) #endif -#define WSM_CMD_TIMEOUT (1 * HZ) -#define WSM_CMD_JOIN_TIMEOUT (7 * HZ) /* Join timeout is 5 sec. in FW */ +#define WSM_CMD_TIMEOUT (2 * HZ) /* With respect to interrupt loss */ +#define WSM_CMD_JOIN_TIMEOUT (7 * HZ) /* Join timeout is 5 sec. in FW */ #define WSM_CMD_START_TIMEOUT (7 * HZ) -#define WSM_TX_TIMEOUT (1 * HZ) +#define WSM_CMD_RESET_TIMEOUT (3 * HZ) /* 2 sec. timeout was observed. */ #define WSM_CMD_LAST_CHANCE_TIMEOUT (10 * HZ) #define WSM_SKIP(buf, size) \ @@ -184,7 +184,7 @@ int wsm_reset(struct cw1200_common *priv, const struct wsm_reset *arg) wsm_cmd_lock(priv); WSM_PUT32(buf, arg->reset_statistics ? 0 : 1); - ret = wsm_cmd_send(priv, buf, NULL, cmd, WSM_CMD_TIMEOUT); + ret = wsm_cmd_send(priv, buf, NULL, cmd, WSM_CMD_RESET_TIMEOUT); wsm_cmd_unlock(priv); return ret; |