Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: slicoss: remove SLIC_PING_TIMER_ENABLED

Browse source 
It was always enabled, so just enable it properly.

Cc: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-02-26 14:09:38 -08:00
parent 04ac01caa6
commit a0a1cbef86
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/slicoss/slicoss.c
View file

@ -59,7 +59,6 @@
#define DEBUG_MICROCODE 1 #define DEBUG_MICROCODE 1
#define DBG 1 #define DBG 1
#define SLIC_ASSERT_ENABLED 1 #define SLIC_ASSERT_ENABLED 1
#define SLIC_PING_TIMER_ENABLED 1
#define SLIC_INTERRUPT_PROCESS_LIMIT 1 #define SLIC_INTERRUPT_PROCESS_LIMIT 1
#define SLIC_OFFLOAD_IP_CHECKSUM 1 #define SLIC_OFFLOAD_IP_CHECKSUM 1
#define STATS_TIMER_INTERVAL 2 #define STATS_TIMER_INTERVAL 2
@ -1392,13 +1391,13 @@ static void slic_init_cleanup(struct adapter *adapter)
adapter->pshmem = NULL; adapter->pshmem = NULL;
adapter->phys_shmem = (dma_addr_t) NULL; adapter->phys_shmem = (dma_addr_t) NULL;
} }
#if SLIC_PING_TIMER_ENABLED
if (adapter->pingtimerset) { if (adapter->pingtimerset) {
DBG_MSG("pingtimer "); DBG_MSG("pingtimer ");
adapter->pingtimerset = 0; adapter->pingtimerset = 0;
del_timer(&adapter->pingtimer); del_timer(&adapter->pingtimer);
} }
#endif
slic_rspqueue_free(adapter); slic_rspqueue_free(adapter);
slic_cmdq_free(adapter); slic_cmdq_free(adapter);
slic_rcvqueue_free(adapter); slic_rcvqueue_free(adapter);
@ -1752,7 +1751,7 @@ static int slic_if_init(struct adapter *adapter)
card->loadtimerset = 1; card->loadtimerset = 1;
} }
#if SLIC_PING_TIMER_ENABLED
if (!adapter->pingtimerset) { if (!adapter->pingtimerset) {
DBG_MSG("slicoss: %s start card_ping_timer(slic)\n", DBG_MSG("slicoss: %s start card_ping_timer(slic)\n",
__func__); __func__);
@ -1765,7 +1764,6 @@ static int slic_if_init(struct adapter *adapter)
adapter->pingtimerset = 1; adapter->pingtimerset = 1;
adapter->card->pingstatus = ISR_PINGMASK; adapter->card->pingstatus = ISR_PINGMASK;
} }
#endif
/* /*
* clear any pending events, then enable interrupts * clear any pending events, then enable interrupts