Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Feb 2009 02:08:20 +0000 (UTC)
From:      Pyun YongHyeon <yongari@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r188550 - head/sys/dev/sis
Message-ID:  <200902130208.n1D28K2b073145@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yongari
Date: Fri Feb 13 02:08:20 2009
New Revision: 188550
URL: http://svn.freebsd.org/changeset/base/188550

Log:
  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:
  head/sys/dev/sis/if_sis.c

Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c	Fri Feb 13 01:50:04 2009	(r188549)
+++ head/sys/dev/sis/if_sis.c	Fri Feb 13 02:08:20 2009	(r188550)
@@ -1663,10 +1663,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))



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902130208.n1D28K2b073145>