Print this page
3014 Intel X540 Support (fix lint)

*** 154,166 **** **/ s32 ixgbe_get_link_capabilities_X540(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *autoneg) { ! ixgbe_get_copper_link_capabilities_generic(hw, speed, autoneg); ! ! return IXGBE_SUCCESS; } /** * ixgbe_get_media_type_X540 - Get media type * @hw: pointer to hardware structure --- 154,164 ---- **/ s32 ixgbe_get_link_capabilities_X540(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *autoneg) { ! return ixgbe_get_copper_link_capabilities_generic(hw, speed, autoneg); } /** * ixgbe_get_media_type_X540 - Get media type * @hw: pointer to hardware structure
*** 570,582 **** /* * Do not use hw->eeprom.ops.read because we do not want to take * the synchronization semaphores twice here. */ ! ixgbe_read_eerd_generic(hw, IXGBE_EEPROM_CHECKSUM, &read_checksum); /* * Verify read checksum from EEPROM is the same as * calculated checksum */ if (read_checksum != checksum) --- 568,581 ---- /* * Do not use hw->eeprom.ops.read because we do not want to take * the synchronization semaphores twice here. */ ! status = ixgbe_read_eerd_generic(hw, IXGBE_EEPROM_CHECKSUM, &read_checksum); + if (status == IXGBE_SUCCESS) { /* * Verify read checksum from EEPROM is the same as * calculated checksum */ if (read_checksum != checksum)
*** 583,592 **** --- 582,592 ---- status = IXGBE_ERR_EEPROM_CHECKSUM; /* If the user cares, return the calculated checksum */ if (checksum_val) *checksum_val = checksum; + } } else { status = IXGBE_ERR_SWFW_SYNC; } hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_EEP_SM);
*** 810,820 **** u32 swfw_sync; u32 swmask = mask; DEBUGFUNC("ixgbe_release_swfw_sync_X540"); ! ixgbe_get_swfw_sync_semaphore(hw); swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC); swfw_sync &= ~swmask; IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync); --- 810,820 ---- u32 swfw_sync; u32 swmask = mask; DEBUGFUNC("ixgbe_release_swfw_sync_X540"); ! (void) ixgbe_get_swfw_sync_semaphore(hw); swfw_sync = IXGBE_READ_REG(hw, IXGBE_SWFW_SYNC); swfw_sync &= ~swmask; IXGBE_WRITE_REG(hw, IXGBE_SWFW_SYNC, swfw_sync);