diff options
| author | phk <phk@FreeBSD.org> | 2005-01-07 23:52:41 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2005-01-07 23:52:41 +0000 |
| commit | cd49c1d16c9338d46fcb40754a30779ffc3e129a (patch) | |
| tree | 6c4dcecea5f9b80523c1bca75a91d0e3e32bb34c /sys/pci | |
| parent | a04d8dc73a03436967105f4c8390f06ccc3e9f36 (diff) | |
| download | FreeBSD-src-cd49c1d16c9338d46fcb40754a30779ffc3e129a.zip FreeBSD-src-cd49c1d16c9338d46fcb40754a30779ffc3e129a.tar.gz | |
Fix compilation of DEVICE_POLLING code.
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_sis.c | 10 | ||||
| -rw-r--r-- | sys/pci/if_sisreg.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 307ab2d..3deff3c 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -1641,12 +1641,12 @@ sis_intr(void *arg) SIS_LOCK(sc); #ifdef DEVICE_POLLING - if (ifp->if_flags & IFF_POLLING) - goto done; - if ((ifp->if_capenable & IFCAP_POLLING) && - ether_poll_register(sis_poll, ifp)) { /* ok, disable interrupts */ + if ((ifp->if_flags & IFF_POLLING) || + ((ifp->if_capenable & IFCAP_POLLING) && + ether_poll_register(sis_poll, ifp))) { /* ok, disable interrupts */ CSR_WRITE_4(sc, SIS_IER, 0); - goto done; + SIS_UNLOCK(sc); + return; } #endif /* DEVICE_POLLING */ diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h index b820924..fe5f677 100644 --- a/sys/pci/if_sisreg.h +++ b/sys/pci/if_sisreg.h @@ -362,7 +362,7 @@ struct sis_desc { #define SIS_TXSTAT_UNDERRUN 0x02000000 #define SIS_TXSTAT_TX_ABORT 0x04000000 -#define SIS_RX_LIST_CNT 64 +#define SIS_RX_LIST_CNT 128 #define SIS_TX_LIST_CNT 128 #define SIS_RX_LIST_SZ SIS_RX_LIST_CNT * sizeof(struct sis_desc) |
