igb: initialize mailbox function pointers prior to phy init
The igb driver is currently initializing the mailbox function pointers after the phy. This causes issues as the phy init will return from the function early if there is no phy present. To resolve this I have moved the function pointer init to a location prior to the phy initialization so that serdes based adapters can also make use of SR-IOV. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0cce119aa9
commit
a0c98605d7
|
@ -172,6 +172,10 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
|
|||
size = 14;
|
||||
nvm->word_size = 1 << size;
|
||||
|
||||
/* if 82576 then initialize mailbox parameters */
|
||||
if (mac->type == e1000_82576)
|
||||
igb_init_mbx_params_pf(hw);
|
||||
|
||||
/* setup PHY parameters */
|
||||
if (phy->media_type != e1000_media_type_copper) {
|
||||
phy->type = e1000_phy_none;
|
||||
|
@ -221,10 +225,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
|
|||
return -E1000_ERR_PHY;
|
||||
}
|
||||
|
||||
/* if 82576 then initialize mailbox parameters */
|
||||
if (mac->type == e1000_82576)
|
||||
igb_init_mbx_params_pf(hw);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue