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

Commit 13cb2dad authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher
Browse files

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: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4d419156

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+4 −3
Original line number Diff line number Diff line
@@ -785,14 +785,14 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) 
	if (!(netdev->flags & IFF_PROMISC)) {

		err = hw->mac.ops.update_vlan(hw, vid, 0, set);

		if (err)

			return err;

			goto err_out;

	}



	/* update our base MAC address */

	err = hw->mac.ops.update_uc_addr(hw, interface->glort, hw->mac.addr,

					 vid, set, 0);

	if (err)

		return err;

		goto err_out;



	/* set vid prior to syncing/unsyncing the VLAN */

	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_mc_unsync(netdev, fm10k_mc_vlan_unsync);



err_out:

	fm10k_mbx_unlock(interface);



	return 0;

	return err;

}



static int fm10k_vlan_rx_add_vid(struct net_device *netdev,