fm10k: Unlock mailbox on VLAN addition failures
After grabbing the mailbox lock and detecting an error, the lock must be released before the error code can be returned. Signed-off-by: Matthew Vick <matthew.vick@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
4d4191566f
commit
13cb2dad45
|
@ -785,14 +785,14 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
|
||||||
if (!(netdev->flags & IFF_PROMISC)) {
|
if (!(netdev->flags & IFF_PROMISC)) {
|
||||||
err = hw->mac.ops.update_vlan(hw, vid, 0, set);
|
err = hw->mac.ops.update_vlan(hw, vid, 0, set);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
goto err_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* update our base MAC address */
|
/* update our base MAC address */
|
||||||
err = hw->mac.ops.update_uc_addr(hw, interface->glort, hw->mac.addr,
|
err = hw->mac.ops.update_uc_addr(hw, interface->glort, hw->mac.addr,
|
||||||
vid, set, 0);
|
vid, set, 0);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
goto err_out;
|
||||||
|
|
||||||
/* set vid prior to syncing/unsyncing the VLAN */
|
/* set vid prior to syncing/unsyncing the VLAN */
|
||||||
interface->vid = vid + (set ? VLAN_N_VID : 0);
|
interface->vid = vid + (set ? VLAN_N_VID : 0);
|
||||||
|
@ -801,9 +801,10 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
|
||||||
__dev_uc_unsync(netdev, fm10k_uc_vlan_unsync);
|
__dev_uc_unsync(netdev, fm10k_uc_vlan_unsync);
|
||||||
__dev_mc_unsync(netdev, fm10k_mc_vlan_unsync);
|
__dev_mc_unsync(netdev, fm10k_mc_vlan_unsync);
|
||||||
|
|
||||||
|
err_out:
|
||||||
fm10k_mbx_unlock(interface);
|
fm10k_mbx_unlock(interface);
|
||||||
|
|
||||||
return 0;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fm10k_vlan_rx_add_vid(struct net_device *netdev,
|
static int fm10k_vlan_rx_add_vid(struct net_device *netdev,
|
||||||
|
|
Loading…
Reference in New Issue