svn commit: r199933 - stable/7/sys/dev/msk

[Pyun YongHyeon]

Author: yongari
Date: Sun Nov 29 19:56:49 2009
New Revision: 199933
URL: http://svn.freebsd.org/changeset/base/199933

Log:
  MFC 198996-198997.
  r198996:
    Remove unnecessary header file.
  
  r198997:
    It's normal to see Rx FIFO overruns under high network load and
    showing the message creates other side-effects. Remove the Rx
    FIFO overrun message in interrupt handler. msk(4) should recover
    from the FIFO overruns without any user intervention. Users can
    still check the Rx FIFO overrun counter from MAC MIB statistics
    maintained in driver(dev.msk.0.stats.rx.overflows).

Modified:
  stable/7/sys/dev/msk/if_msk.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/msk/if_msk.c
==============================================================================
--- stable/7/sys/dev/msk/if_msk.c	Sun Nov 29 19:54:32 2009	(r199932)
+++ stable/7/sys/dev/msk/if_msk.c	Sun Nov 29 19:56:49 2009	(r199933)
@@ -137,7 +137,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
-#include <dev/mii/brgphyreg.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
@@ -3216,11 +3215,9 @@ msk_intr_gmac(struct msk_if_softc *sc_if
 	status = CSR_READ_1(sc, MR_ADDR(sc_if->msk_port, GMAC_IRQ_SRC));
 
 	/* GMAC Rx FIFO overrun. */
-	if ((status & GM_IS_RX_FF_OR) != 0) {
+	if ((status & GM_IS_RX_FF_OR) != 0)
 		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, RX_GMF_CTRL_T),
 		    GMF_CLI_RX_FO);
-		device_printf(sc_if->msk_if_dev, "Rx FIFO overrun!\n");
-	}
 	/* GMAC Tx FIFO underrun. */
 	if ((status & GM_IS_TX_FF_UR) != 0) {
 		CSR_WRITE_4(sc, MR_ADDR(sc_if->msk_port, TX_GMF_CTRL_T),