Author: yongari
Date: Thu Mar 19 00:55:27 2009
New Revision: 190009
URL: http://svn.freebsd.org/changeset/base/190009
Log:
MFC r188550:
Receving VLAN oversized frames raise SIS_ISR_RX_ERR interrupt, so
make sis_rxeof() handle that too. Previously it used to receive the
frame and reset controller.
PR: kern/131414
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/dev/sis/if_sis.c
Modified: stable/7/sys/dev/sis/if_sis.c
==============================================================================
--- stable/7/sys/dev/sis/if_sis.c Thu Mar 19 00:52:30 2009
(r190008)
+++ stable/7/sys/dev/sis/if_sis.c Thu Mar 19 00:55:27 2009
(r190009)
@@ -1662,10 +1662,11 @@ sis_intr(void *arg)
SIS_ISR_TX_OK | SIS_ISR_TX_IDLE) )
sis_txeof(sc);
- if (status & (SIS_ISR_RX_DESC_OK|SIS_ISR_RX_OK|SIS_ISR_RX_IDLE))
+ if (status & (SIS_ISR_RX_DESC_OK | SIS_ISR_RX_OK |
+ SIS_ISR_RX_ERR | SIS_ISR_RX_IDLE))
sis_rxeof(sc);
- if (status & (SIS_ISR_RX_ERR | SIS_ISR_RX_OFLOW))
+ if (status & SIS_ISR_RX_OFLOW)
sis_rxeoc(sc);
if (status & (SIS_ISR_RX_IDLE))
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
