- Nuke interrupt bits definition which don't apply to 8169
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 7 Oct 2008 11:39:36 +0000 (11:39 +0000)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Tue, 7 Oct 2008 11:39:36 +0000 (11:39 +0000)
- Don't test TX desc unavailable bit in re_intr, since it is never enabled

sys/dev/netif/re/if_re.c
sys/dev/netif/re/if_rereg.h

index 1c28bab..821b075 100644 (file)
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $
- * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.69 2008/10/06 14:51:10 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.70 2008/10/07 11:39:36 sephe Exp $
  */
 
 /*
@@ -2030,9 +2030,7 @@ re_intr(void *arg)
                if (status & (RE_ISR_RX_OK | RE_ISR_RX_ERR | RE_ISR_FIFO_OFLOW))
                        re_rxeof(sc);
 
-               if ((status & sc->re_tx_ack) ||
-                   (status & RE_ISR_TX_ERR) ||
-                   (status & RE_ISR_TX_DESC_UNAVAIL))
+               if (status & (sc->re_tx_ack | RE_ISR_TX_ERR))
                        re_txeof(sc);
 
                if (status & RE_ISR_SYSTEM_ERR) {
index 3b136d8..acdd25b 100644 (file)
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.42 2004/05/24 19:39:23 jhb Exp $
- * $DragonFly: src/sys/dev/netif/re/if_rereg.h,v 1.14 2008/10/06 14:22:32 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_rereg.h,v 1.15 2008/10/07 11:39:36 sephe Exp $
  */
 
 /*
 #define RE_ISR_TX_OK           0x0004
 #define RE_ISR_TX_ERR          0x0008
 #define RE_ISR_RX_OVERRUN      0x0010
-#define RE_ISR_PKT_UNDERRUN    0x0020
 #define RE_ISR_LINKCHG         0x0020  /* 8169 only */
 #define RE_ISR_FIFO_OFLOW      0x0040  /* 8139 only */
 #define RE_ISR_TX_DESC_UNAVAIL 0x0080  /* C+ only */
 #define RE_ISR_SWI             0x0100  /* C+ only */
 #define RE_ISR_CABLE_LEN_CHGD  0x2000
-#define RE_ISR_PCS_TIMEOUT     0x4000  /* 8129 only */
 #define RE_ISR_TIMEOUT_EXPIRED 0x4000
 #define RE_ISR_SYSTEM_ERR      0x8000
 
-#define RE_INTRS       \
-       (RE_ISR_RX_OK|RE_ISR_RX_ERR|RE_ISR_TX_ERR|                      \
-       RE_ISR_RX_OVERRUN|RE_ISR_PKT_UNDERRUN|RE_ISR_FIFO_OFLOW|        \
-       RE_ISR_PCS_TIMEOUT|RE_ISR_SYSTEM_ERR|RE_ISR_TIMEOUT_EXPIRED)
+#define RE_INTRS \
+       (RE_ISR_RX_OK|RE_ISR_RX_ERR|RE_ISR_TX_ERR| \
+       RE_ISR_RX_OVERRUN|RE_ISR_FIFO_OFLOW| \
+       RE_ISR_SYSTEM_ERR|RE_ISR_TIMEOUT_EXPIRED)
 
 #ifdef RE_DIAG
-#define RE_INTRS_DIAG  \
-       (RE_ISR_TX_OK|RE_ISR_RX_OK|RE_ISR_RX_ERR|RE_ISR_TX_ERR|         \
-       RE_ISR_RX_OVERRUN|RE_ISR_PKT_UNDERRUN|RE_ISR_FIFO_OFLOW|        \
-       RE_ISR_PCS_TIMEOUT|RE_ISR_SYSTEM_ERR)
+#define RE_INTRS_DIAG \
+       (RE_ISR_TX_OK|RE_ISR_RX_OK|RE_ISR_RX_ERR|RE_ISR_TX_ERR| \
+       RE_ISR_RX_OVERRUN|RE_ISR_FIFO_OFLOW| \
+       RE_ISR_SYSTEM_ERR)
 #endif
 
 /*