Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55570b6f authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbe: set device if before calling get_invariants 



Fix an issue where set_phy_power was NULL for X550 copper devices
because get_invariants was called before hw->device_id was set.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b71f6c40

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+6 −4
Original line number Diff line number Diff line
@@ -5624,7 +5624,8 @@ static void ixgbe_init_dcb(struct ixgbe_adapter *adapter) 
 * Fields are initialized based on PCI device information and

 * OS network device settings (MTU size).

 **/

static int ixgbe_sw_init(struct ixgbe_adapter *adapter)

static int ixgbe_sw_init(struct ixgbe_adapter *adapter,

			 const struct ixgbe_info *ii)

{

	struct ixgbe_hw *hw = &adapter->hw;

	struct pci_dev *pdev = adapter->pdev;
@@ -5640,6 +5641,9 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter) 
	hw->subsystem_vendor_id = pdev->subsystem_vendor;

	hw->subsystem_device_id = pdev->subsystem_device;



	/* get_invariants needs the device IDs */

	ii->get_invariants(hw);



	/* Set common capability flags and settings */

	rss = min_t(int, ixgbe_max_rss_indices(adapter), num_online_cpus());

	adapter->ring_feature[RING_F_RSS].limit = rss;
@@ -9532,10 +9536,8 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	hw->phy.mdio.mdio_read = ixgbe_mdio_read;

	hw->phy.mdio.mdio_write = ixgbe_mdio_write;



	ii->get_invariants(hw);



	/* setup the private structure */

	err = ixgbe_sw_init(adapter);

	err = ixgbe_sw_init(adapter, ii);

	if (err)

		goto err_sw_init;