From f6fcd7f86984de67827b632fafe8c88c33c97715 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 26 Feb 2009 14:09:38 -0800 Subject: [PATCH] --- yaml --- r: 141095 b: refs/heads/master c: a0a1cbef8667c410d5118716ce293af1a384107f h: refs/heads/master i: 141093: db4c32936d84599f23f85ba6736d0660135f3929 141091: 15718341220676451050fb742bf913f2a4954a74 141087: bcd61a90fd627a2c31e69754873add596fffd251 v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a12daf98ce25..b5a896db98df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04ac01caa68aca58347ff91354fc4851c9d619e9 +refs/heads/master: a0a1cbef8667c410d5118716ce293af1a384107f diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index 53081140d194..f3e369b9d5b9 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -59,7 +59,6 @@ #define DEBUG_MICROCODE 1 #define DBG 1 #define SLIC_ASSERT_ENABLED 1 -#define SLIC_PING_TIMER_ENABLED 1 #define SLIC_INTERRUPT_PROCESS_LIMIT 1 #define SLIC_OFFLOAD_IP_CHECKSUM 1 #define STATS_TIMER_INTERVAL 2 @@ -1392,13 +1391,13 @@ static void slic_init_cleanup(struct adapter *adapter) adapter->pshmem = NULL; adapter->phys_shmem = (dma_addr_t) NULL; } -#if SLIC_PING_TIMER_ENABLED + if (adapter->pingtimerset) { DBG_MSG("pingtimer "); adapter->pingtimerset = 0; del_timer(&adapter->pingtimer); } -#endif + slic_rspqueue_free(adapter); slic_cmdq_free(adapter); slic_rcvqueue_free(adapter); @@ -1752,7 +1751,7 @@ static int slic_if_init(struct adapter *adapter) card->loadtimerset = 1; } -#if SLIC_PING_TIMER_ENABLED + if (!adapter->pingtimerset) { DBG_MSG("slicoss: %s start card_ping_timer(slic)\n", __func__); @@ -1765,7 +1764,6 @@ static int slic_if_init(struct adapter *adapter) adapter->pingtimerset = 1; adapter->card->pingstatus = ISR_PINGMASK; } -#endif /* * clear any pending events, then enable interrupts