OSDN Git Service

staging: wilc1000: remove sleep and reduce close timeout
authorGlen Lee <glen.lee@atmel.com>
Mon, 25 Jan 2016 07:35:11 +0000 (16:35 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:25:40 +0000 (15:25 -0800)
sleep is not necessary during handling tx queue so remove it and also reduce
close time to 5 sec since it is enough time to close.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/linux_wlan.c

index 54fe9d7..236996f 100644 (file)
@@ -391,9 +391,6 @@ static int linux_wlan_txq_task(void *vp)
                        }
 
                        if (ret == WILC_TX_ERR_NO_BUF) {
-                               do {
-                                       msleep(TX_BACKOFF_WEIGHT_UNIT_MS << backoff_weight);
-                               } while (0);
                                backoff_weight += TX_BACKOFF_WEIGHT_INCR_STEP;
                                if (backoff_weight > TX_BACKOFF_WEIGHT_MAX)
                                        backoff_weight = TX_BACKOFF_WEIGHT_MAX;
@@ -1403,7 +1400,7 @@ void wilc_netdev_cleanup(struct wilc *wilc)
                release_firmware(wilc->firmware);
 
        if (wilc && (wilc->vif[0]->ndev || wilc->vif[1]->ndev)) {
-               wilc_lock_timeout(wilc, &close_exit_sync, 12 * 1000);
+               wilc_lock_timeout(wilc, &close_exit_sync, 5 * 1000);
 
                for (i = 0; i < NUM_CONCURRENT_IFC; i++)
                        if (wilc->vif[i]->ndev)