33c33
< /*$FreeBSD: head/sys/dev/e1000/e1000_80003es2lan.c 287990 2015-09-19 18:22:59Z sbruno $*/
---
> /*$FreeBSD: head/sys/dev/e1000/e1000_80003es2lan.c 295323 2016-02-05 17:14:37Z erj $*/
854,858c854,864
< e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
< &kum_reg_data);
< kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
< e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
< kum_reg_data);
---
> ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
> E1000_KMRNCTRLSTA_INBAND_PARAM, &kum_reg_data);
> if (!ret_val) {
> kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
> ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
> E1000_KMRNCTRLSTA_INBAND_PARAM,
> kum_reg_data);
> if (ret_val)
> DEBUGOUT("Error disabling far-end loopback\n");
> } else
> DEBUGOUT("Error disabling far-end loopback\n");
914,918c920,931
< e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
< &kum_reg_data);
< kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
< e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
< kum_reg_data);
---
> ret_val =
> e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
> &kum_reg_data);
> if (!ret_val) {
> kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
> ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
> E1000_KMRNCTRLSTA_INBAND_PARAM,
> kum_reg_data);
> if (ret_val)
> DEBUGOUT("Error disabling far-end loopback\n");
> } else
> DEBUGOUT("Error disabling far-end loopback\n");