summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_ixgb.c8
-rw-r--r--sys/dev/pci/if_xge.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/if_ixgb.c b/sys/dev/pci/if_ixgb.c
index dff664ecad2..ecf6716341e 100644
--- a/sys/dev/pci/if_ixgb.c
+++ b/sys/dev/pci/if_ixgb.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
***************************************************************************/
-/* $OpenBSD: if_ixgb.c,v 1.18 2006/05/28 00:04:24 jason Exp $ */
+/* $OpenBSD: if_ixgb.c,v 1.19 2006/06/21 07:15:58 brad Exp $ */
#include <dev/pci/if_ixgb.h>
@@ -608,7 +608,7 @@ ixgb_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
}
ifmr->ifm_status |= IFM_ACTIVE;
- ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
+ ifmr->ifm_active |= IFM_10G_SR | IFM_FDX;
return;
}
@@ -1047,9 +1047,9 @@ ixgb_setup_interface(struct ixgb_softc *sc)
*/
ifmedia_init(&sc->media, IFM_IMASK, ixgb_media_change,
ixgb_media_status);
- ifmedia_add(&sc->media, IFM_ETHER | IFM_1000_SX | IFM_FDX,
+ ifmedia_add(&sc->media, IFM_ETHER | IFM_10G_SR | IFM_FDX,
0, NULL);
- ifmedia_add(&sc->media, IFM_ETHER | IFM_1000_SX,
+ ifmedia_add(&sc->media, IFM_ETHER | IFM_10G_SR,
0, NULL);
ifmedia_add(&sc->media, IFM_ETHER | IFM_AUTO, 0, NULL);
ifmedia_set(&sc->media, IFM_ETHER | IFM_AUTO);
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index e7299ed326d..cadbbd8e99a 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xge.c,v 1.24 2006/06/09 19:09:41 brad Exp $ */
+/* $OpenBSD: if_xge.c,v 1.25 2006/06/21 07:15:58 brad Exp $ */
/* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */
/*
@@ -555,8 +555,8 @@ xge_attach(struct device *parent, struct device *self, void *aux)
*/
ifmedia_init(&sc->xena_media, IFM_IMASK, xge_xgmii_mediachange,
xge_ifmedia_status);
- ifmedia_add(&sc->xena_media, IFM_ETHER|IFM_1000_SX, 0, NULL);
- ifmedia_set(&sc->xena_media, IFM_ETHER|IFM_1000_SX);
+ ifmedia_add(&sc->xena_media, IFM_ETHER|IFM_10G_SR, 0, NULL);
+ ifmedia_set(&sc->xena_media, IFM_ETHER|IFM_10G_SR);
ifp = &sc->sc_arpcom.ac_if;
strlcpy(ifp->if_xname, XNAME, IFNAMSIZ);
@@ -604,7 +604,7 @@ xge_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
uint64_t reg;
ifmr->ifm_status = IFM_AVALID;
- ifmr->ifm_active = IFM_ETHER|IFM_1000_SX;
+ ifmr->ifm_active = IFM_ETHER|IFM_10G_SR;
reg = PIF_RCSR(ADAPTER_STATUS);
if ((reg & (RMAC_REMOTE_FAULT|RMAC_LOCAL_FAULT)) == 0)