diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-08-18 07:05:00 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-08-18 07:05:00 +0000 |
| commit | f6cebc060671b6c67f52080c35a0e55d5498cbf0 (patch) | |
| tree | 344b7a3da98a22c060f844fe311e36665045f41f /sys/pci/if_sis.c | |
| parent | 2f2bf8ffc0ae7c92c322a28e5781db15fbca6226 (diff) | |
| download | FreeBSD-src-f6cebc060671b6c67f52080c35a0e55d5498cbf0.zip FreeBSD-src-f6cebc060671b6c67f52080c35a0e55d5498cbf0.tar.gz | |
Increase size of ifnet.if_flags from 16 bits (short) to 32 bits (int). To avoid
breaking application ABI use unused ifreq.ifru_flags[1] for upper 16 bits in
SIOCSIFFLAGS and SIOCGIFFLAGS ioctl's.
Reviewed by: -hackers, -net
Diffstat (limited to 'sys/pci/if_sis.c')
| -rw-r--r-- | sys/pci/if_sis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index d958866..977e83f 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -1285,7 +1285,7 @@ static void sis_rxeof(sc) while(SIS_OWNDESC(&sc->sis_ldata.sis_rx_list[i])) { #ifdef DEVICE_POLLING - if (ifp->if_ipending & IFF_POLLING) { + if (ifp->if_flags & IFF_POLLING) { if (sc->rxcycles <= 0) break; sc->rxcycles--; @@ -1508,7 +1508,7 @@ static void sis_intr(arg) SIS_LOCK(sc); #ifdef DEVICE_POLLING - if (ifp->if_ipending & IFF_POLLING) + if (ifp->if_flags & IFF_POLLING) goto done; if (ether_poll_register(sis_poll, ifp)) { /* ok, disable interrupts */ CSR_WRITE_4(sc, SIS_IER, 0); @@ -1810,7 +1810,7 @@ static void sis_init(xsc) * ... only enable interrupts if we are not polling, make sure * they are off otherwise. */ - if (ifp->if_ipending & IFF_POLLING) + if (ifp->if_flags & IFF_POLLING) CSR_WRITE_4(sc, SIS_IER, 0); else #endif /* DEVICE_POLLING */ |
