|
@@ -1532,8 +1532,8 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- if (test_bit(__I40E_VSI_DOWN, vsi->back->state) ||
|
|
|
- test_bit(__I40E_RESET_RECOVERY_PENDING, vsi->back->state))
|
|
|
+ if (test_bit(__I40E_DOWN, pf->state) ||
|
|
|
+ test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
if (ether_addr_equal(hw->mac.addr, addr->sa_data))
|
|
@@ -1557,8 +1557,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
|
|
|
if (vsi->type == I40E_VSI_MAIN) {
|
|
|
i40e_status ret;
|
|
|
|
|
|
- ret = i40e_aq_mac_address_write(&vsi->back->hw,
|
|
|
- I40E_AQC_WRITE_TYPE_LAA_WOL,
|
|
|
+ ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL,
|
|
|
addr->sa_data, NULL);
|
|
|
if (ret)
|
|
|
netdev_info(netdev, "Ignoring error from firmware on LAA update, status %s, AQ ret %s\n",
|
|
@@ -1569,7 +1568,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p)
|
|
|
/* schedule our worker thread which will take care of
|
|
|
* applying the new filter changes
|
|
|
*/
|
|
|
- i40e_service_event_schedule(vsi->back);
|
|
|
+ i40e_service_event_schedule(pf);
|
|
|
return 0;
|
|
|
}
|
|
|
|