From 3648042ae90df4a1f2b5d6ce554378ef33c26e8f Mon Sep 17 00:00:00 2001 From: "Matthew N. Dodd" Date: Fri, 24 Jan 2003 00:37:10 +0000 Subject: [PATCH] - The 'aux' field isn't around any longer. - Add missing splnet()/splx() --- sys/dev/idt/idt.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c index 3971e081ff6c..e5169e01930b 100644 --- a/sys/dev/idt/idt.c +++ b/sys/dev/idt/idt.c @@ -2571,7 +2571,6 @@ idt_transmit(IDT * idt, struct mbuf * mfirst, int vpi, int vci, int flags) * m_pkthdr.header TX queue pointer (06/01/2001) * m_pkthdr.csum_flags Unused, keep zero * m_pkthdr.csum_data Number of SCQ entries needed or used - * m_pkthdr.aux Unused, keep NULL * ******************************************************************************* * @@ -3110,12 +3109,6 @@ nicstar_recv(nicstar_reg_t * idt) mptr->m_pkthdr.rcvif = NULL; mptr->m_nextpkt = NULL; - if (mptr->m_pkthdr.aux != NULL) { - device_printf(idt->dev, - "received pkthdr.aux=%x\n", - (int)mptr->m_pkthdr.aux); - mptr->m_pkthdr.aux = NULL; - } if (mptr->m_pkthdr.csum_flags) { device_printf(idt->dev, "received pkthdr.csum_flags=%x\n", @@ -3212,11 +3205,14 @@ nicstar_intr(void *arg) volatile u_long stat_val, config_val; int int_flags; volatile int i; + int s; idt = (IDT *) arg; i = 0; + s = splnet(); + config_val = *idt->reg_cfg; stat_val = *idt->reg_stat; @@ -3302,6 +3298,8 @@ nicstar_intr(void *arg) } stat_val = *idt->reg_stat; } + + splx(s); if (i < 1 || i > 50) device_printf(idt->dev, "i=%3d, status=%08x\n", i, (int)stat_val); }