aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e/82571.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/82571.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 7ef4711a32b8..795c3d640615 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -235,16 +235,15 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw)
235 * e1000_init_mac_params_82571 - Init MAC func ptrs. 235 * e1000_init_mac_params_82571 - Init MAC func ptrs.
236 * @hw: pointer to the HW structure 236 * @hw: pointer to the HW structure
237 **/ 237 **/
238static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) 238static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
239{ 239{
240 struct e1000_hw *hw = &adapter->hw;
241 struct e1000_mac_info *mac = &hw->mac; 240 struct e1000_mac_info *mac = &hw->mac;
242 u32 swsm = 0; 241 u32 swsm = 0;
243 u32 swsm2 = 0; 242 u32 swsm2 = 0;
244 bool force_clear_smbi = false; 243 bool force_clear_smbi = false;
245 244
246 /* Set media type and media-dependent function pointers */ 245 /* Set media type and media-dependent function pointers */
247 switch (adapter->pdev->device) { 246 switch (hw->adapter->pdev->device) {
248 case E1000_DEV_ID_82571EB_FIBER: 247 case E1000_DEV_ID_82571EB_FIBER:
249 case E1000_DEV_ID_82572EI_FIBER: 248 case E1000_DEV_ID_82572EI_FIBER:
250 case E1000_DEV_ID_82571EB_QUAD_FIBER: 249 case E1000_DEV_ID_82571EB_QUAD_FIBER:
@@ -371,7 +370,7 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)
371 int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1; 370 int is_port_b = er32(STATUS) & E1000_STATUS_FUNC_1;
372 s32 rc; 371 s32 rc;
373 372
374 rc = e1000_init_mac_params_82571(adapter); 373 rc = e1000_init_mac_params_82571(hw);
375 if (rc) 374 if (rc)
376 return rc; 375 return rc;
377 376