Module Name: src
Committed By: snj
Date: Sun Nov 8 21:55:46 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: if_age.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #1124):
sys/dev/pci/if_age.c: revision 1.29
support flow control. from OpenBSD.
tested by hans@
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 src/sys/dev/pci/if_age.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.28.2.2 src/sys/dev/pci/if_age.c:1.28.2.3
--- src/sys/dev/pci/if_age.c:1.28.2.2 Sun May 3 23:45:47 2009
+++ src/sys/dev/pci/if_age.c Sun Nov 8 21:55:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.28.2.2 2009/05/03 23:45:47 snj Exp $ */
+/* $NetBSD: if_age.c,v 1.28.2.3 2009/11/08 21:55:46 snj Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.2 2009/05/03 23:45:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.3 2009/11/08 21:55:46 snj Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -275,7 +275,7 @@
ifmedia_init(&sc->sc_miibus.mii_media, 0, age_mediachange,
age_mediastatus);
mii_attach(self, &sc->sc_miibus, 0xffffffff, MII_PHY_ANY,
- MII_OFFSET_ANY, 0);
+ MII_OFFSET_ANY, MIIF_DOPAUSE);
if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) {
aprint_error_dev(self, "no PHY found!\n");
@@ -1166,12 +1166,10 @@
}
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
reg |= MAC_CFG_FULL_DUPLEX;
-#ifdef notyet
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
reg |= MAC_CFG_TX_FC;
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
reg |= MAC_CFG_RX_FC;
-#endif
}
CSR_WRITE_4(sc, AGE_MAC_CFG, reg);
