summaryrefslogtreecommitdiffstats
path: root/sys/dev/fxp
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2002-08-18 07:05:00 +0000
committersobomax <sobomax@FreeBSD.org>2002-08-18 07:05:00 +0000
commitf6cebc060671b6c67f52080c35a0e55d5498cbf0 (patch)
tree344b7a3da98a22c060f844fe311e36665045f41f /sys/dev/fxp
parent2f2bf8ffc0ae7c92c322a28e5781db15fbca6226 (diff)
downloadFreeBSD-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/dev/fxp')
-rw-r--r--sys/dev/fxp/if_fxp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 3d8ba4c..594d9ac 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -1193,7 +1193,7 @@ fxp_intr(void *xsc)
#ifdef DEVICE_POLLING
struct ifnet *ifp = &sc->sc_if;
- if (ifp->if_ipending & IFF_POLLING)
+ if (ifp->if_flags & IFF_POLLING)
return;
if (ether_poll_register(fxp_poll, ifp)) {
/* disable interrupts */
@@ -1785,7 +1785,7 @@ fxp_init(void *xsc)
* ... but only do that if we are not polling. And because (presumably)
* the default is interrupts on, we need to disable them explicitly!
*/
- if ( ifp->if_ipending & IFF_POLLING )
+ if ( ifp->if_flags & IFF_POLLING )
CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE);
else
#endif /* DEVICE_POLLING */
OpenPOWER on IntegriCloud