diff options
| author |   mikeb <mikeb@openbsd.org> | 2016-12-09 17:41:39 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2016-12-09 17:41:39 +0000 |
| commit | 49de29465a25533e7f12d3e132a2ce88f9288b0a (patch) | |
| tree | cba9b0f16247169a0eb758a7eef45eb1896b23a7 | |
| parent | Convert to the new xs_{get,set}num XenStore API (diff) | |
| download | wireguard-openbsd-49de29465a25533e7f12d3e132a2ce88f9288b0a.tar.xz wireguard-openbsd-49de29465a25533e7f12d3e132a2ce88f9288b0a.zip | |
Update the media as the last step in the SFP module configuration
The problem noticed, fix tested and OK procter@
| -rw-r--r-- | sys/dev/pci/if_ix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index 4bc8bc8148f..e056b59821d 100644 --- a/sys/dev/pci/if_ix.c +++ b/sys/dev/pci/if_ix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ix.c,v 1.147 2016/12/06 16:13:01 mikeb Exp $ */ +/* $OpenBSD: if_ix.c,v 1.148 2016/12/09 17:41:39 mikeb Exp $ */ /****************************************************************************** @@ -3255,10 +3255,6 @@ ixgbe_handle_mod(struct ix_softc *sc) /* Set the optics type so system reports correctly */ ixgbe_setup_optics(sc); - ifmedia_delete_instance(&sc->media, IFM_INST_ANY); - ixgbe_add_media_types(sc); - ifmedia_set(&sc->media, IFM_ETHER | IFM_AUTO); - ixgbe_handle_msf(sc); } @@ -3280,6 +3276,10 @@ ixgbe_handle_msf(struct ix_softc *sc) } if (hw->mac.ops.setup_link) hw->mac.ops.setup_link(hw, autoneg, TRUE); + + ifmedia_delete_instance(&sc->media, IFM_INST_ANY); + ixgbe_add_media_types(sc); + ifmedia_set(&sc->media, IFM_ETHER | IFM_AUTO); } /* |