diff options
| author | Malli Chilakala <mallikarjuna.chilakala@intel.com> | 2005-08-25 13:06:23 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-25 16:18:33 -0400 |
| commit | e6280f26b43775d8fa0c54e50c92491cfccbf738 (patch) | |
| tree | 6b92e1d76e38a75198382011f2f4702757e1de72 /drivers/net/e100.c | |
| parent | 996ec3533ae15424e339089a8045ca1c998f8a87 (diff) | |
| download | linux-stable-e6280f26b43775d8fa0c54e50c92491cfccbf738.tar.gz linux-stable-e6280f26b43775d8fa0c54e50c92491cfccbf738.tar.bz2 linux-stable-e6280f26b43775d8fa0c54e50c92491cfccbf738.zip | |
[PATCH] e100: Increased delay loop for command blocks
Increased delay loop for command blocks
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index e0fcac889a5a..09448ec48a79 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -785,6 +785,7 @@ static int e100_eeprom_save(struct nic *nic, u16 start, u16 count) } #define E100_WAIT_SCB_TIMEOUT 20000 /* we might have to wait 100ms!!! */ +#define E100_WAIT_SCB_FAST 20 /* delay like the old code */ static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr) { unsigned long flags; @@ -798,7 +799,7 @@ static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr) if(likely(!readb(&nic->csr->scb.cmd_lo))) break; cpu_relax(); - if(unlikely(i > (E100_WAIT_SCB_TIMEOUT >> 1))) + if(unlikely(i > E100_WAIT_SCB_FAST)) udelay(5); } if(unlikely(i == E100_WAIT_SCB_TIMEOUT)) { |