summaryrefslogtreecommitdiffstats
path: root/sys/dev/dc
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/dc
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/dc')
-rw-r--r--sys/dev/dc/if_dc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 7c55346..d854a44 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2483,7 +2483,7 @@ static void dc_rxeof(sc)
while(!(sc->dc_ldata->dc_rx_list[i].dc_status & DC_RXSTAT_OWN)) {
#ifdef DEVICE_POLLING
- if (ifp->if_ipending & IFF_POLLING) {
+ if (ifp->if_flags & IFF_POLLING) {
if (sc->rxcycles <= 0)
break;
sc->rxcycles--;
@@ -2885,7 +2885,7 @@ static void dc_intr(arg)
DC_LOCK(sc);
ifp = &sc->arpcom.ac_if;
#ifdef DEVICE_POLLING
- if (ifp->if_ipending & IFF_POLLING)
+ if (ifp->if_flags & IFF_POLLING)
goto done;
if (ether_poll_register(dc_poll, ifp)) { /* ok, disable interrupts */
CSR_WRITE_4(sc, DC_IMR, 0x00000000);
@@ -3265,7 +3265,7 @@ static void dc_init(xsc)
* the case of polling. Some cards (e.g. fxp) turn interrupts on
* after a reset.
*/
- if (ifp->if_ipending & IFF_POLLING)
+ if (ifp->if_flags & IFF_POLLING)
CSR_WRITE_4(sc, DC_IMR, 0x00000000);
else
#endif
OpenPOWER on IntegriCloud