From 1eee5089159717c30380898f5c79428e78029e93 Mon Sep 17 00:00:00 2001 From: gerhard Date: Thu, 21 May 2015 07:39:52 +0000 Subject: [PATCH] Access to uninitialized variable fixed. ok mikeb@ --- sys/dev/pci/if_ix.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c index bb90916e2fa..a6085689931 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.119 2015/04/30 14:17:26 jsg Exp $ */ +/* $OpenBSD: if_ix.c,v 1.120 2015/05/21 07:39:52 gerhard Exp $ */ /****************************************************************************** @@ -3236,15 +3236,14 @@ void ixgbe_handle_msf(struct ix_softc *sc) { struct ixgbe_hw *hw = &sc->hw; - uint32_t autoneg, err; + uint32_t autoneg; bool negotiate; autoneg = hw->phy.autoneg_advertised; - if ((!autoneg) && (hw->mac.ops.get_link_capabilities)) - err = hw->mac.ops.get_link_capabilities(hw, &autoneg, - &negotiate); - if (err) - return; + if ((!autoneg) && (hw->mac.ops.get_link_capabilities)) { + if (hw->mac.ops.get_link_capabilities(hw, &autoneg, &negotiate)) + return; + } if (hw->mac.ops.setup_link) hw->mac.ops.setup_link(hw, autoneg, TRUE); } -- 2.20.1