diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-11-17 21:18:24 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2016-11-17 21:18:24 +0000 |
| commit | 11f10d12ffd23a8d541a7a996c4435802e0bf9f8 (patch) | |
| tree | d0b092c98c32130e2a6911d6eb4f6e27c2b321cc /sys/dev | |
| parent | e2baaed5501b701ea48c61a91ea1f932a1d6acff (diff) | |
A firmware block check missed in previous commits
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/ixgbe_phy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/pci/ixgbe_phy.c b/sys/dev/pci/ixgbe_phy.c index a4f5e61df09..0787534b7e8 100644 --- a/sys/dev/pci/ixgbe_phy.c +++ b/sys/dev/pci/ixgbe_phy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ixgbe_phy.c,v 1.17 2016/11/17 21:13:27 mikeb Exp $ */ +/* $OpenBSD: ixgbe_phy.c,v 1.18 2016/11/17 21:18:23 mikeb Exp $ */ /****************************************************************************** @@ -1208,6 +1208,10 @@ int32_t ixgbe_reset_phy_nl(struct ixgbe_hw *hw) DEBUGFUNC("ixgbe_reset_phy_nl"); + /* Blocked by MNG FW so bail */ + if (ixgbe_check_reset_blocked(hw)) + goto out; + hw->phy.ops.read_reg(hw, IXGBE_MDIO_PHY_XS_CONTROL, IXGBE_MDIO_PHY_XS_DEV_TYPE, &phy_data); |