void-packages/srcpkgs/xen/files/gcc6_fix_5.patch

32 lines
893 B
Diff

--- ipxe/src/drivers/net/e1000/e1000_phy.c 2011-12-11 03:28:04.000000000 +0100
+++ ipxe/src/drivers/net/e1000/e1000_phy.c 2016-10-13 12:33:50.081735254 +0200
@@ -167,18 +167,18 @@
if (!(phy->ops.read_reg))
goto out;
- ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
- if (ret_val)
- goto out;
+ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+ if (ret_val)
+ goto out;
- phy->id = (u32)(phy_id << 16);
- usec_delay(20);
- ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
- if (ret_val)
- goto out;
+ phy->id = (u32)(phy_id << 16);
+ usec_delay(20);
+ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+ if (ret_val)
+ goto out;
- phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
- phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+ phy->id |= (u32)(phy_id & PHY_REVISION_MASK);
+ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
out:
return ret_val;