diff options
| author | jfv <jfv@FreeBSD.org> | 2014-07-28 21:11:18 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2014-07-28 21:11:18 +0000 |
| commit | 00e682104eb14211088566f56db127cc292bc3bf (patch) | |
| tree | e1e530888e00e37f9544ea33cebd0f8d60fd6d25 /sys/dev/e1000/e1000_manage.c | |
| parent | 37a9f7be2fd32cf24c75d466cacac9ce83a3766b (diff) | |
| download | FreeBSD-src-00e682104eb14211088566f56db127cc292bc3bf.zip FreeBSD-src-00e682104eb14211088566f56db127cc292bc3bf.tar.gz | |
MFC of R267935: Sync the E1000 shared code to Intel internal, and
more importantly add new I218 adapter support to em.
Diffstat (limited to 'sys/dev/e1000/e1000_manage.c')
| -rw-r--r-- | sys/dev/e1000/e1000_manage.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/e1000/e1000_manage.c b/sys/dev/e1000/e1000_manage.c index c58d32d..8087e65 100644 --- a/sys/dev/e1000/e1000_manage.c +++ b/sys/dev/e1000/e1000_manage.c @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2013, Intel Corporation + Copyright (c) 2001-2014, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -364,9 +364,12 @@ bool e1000_enable_mng_pass_thru(struct e1000_hw *hw) } else if ((hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82583)) { u16 data; + s32 ret_val; factps = E1000_READ_REG(hw, E1000_FACTPS); - e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data); + ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data); + if (ret_val) + return FALSE; if (!(factps & E1000_FACTPS_MNGCG) && ((data & E1000_NVM_INIT_CTRL2_MNGM) == @@ -374,7 +377,7 @@ bool e1000_enable_mng_pass_thru(struct e1000_hw *hw) return TRUE; } else if ((manc & E1000_MANC_SMBUS_EN) && !(manc & E1000_MANC_ASF_EN)) { - return TRUE; + return TRUE; } return FALSE; |
