Commit 2135a8d5 authored by Nicholas Nunley's avatar Nicholas Nunley Committed by Tony Nguyen
Browse files

iavf: don't clear a lock we don't hold 



In iavf_configure_clsflower() the function will bail out if it is unable
to obtain the crit_section lock in a reasonable time. However, it will
clear the lock when exiting, so fix this.

Fixes: 640a8af5 ("i40evf: Reorder configure_clsflower to avoid deadlock on error")
Signed-off-by: default avatarNicholas Nunley <nicholas.d.nunley@intel.com>
Tested-by: default avatarTony Brelinski <tony.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 89f22f12

drivers/net/ethernet/intel/iavf/iavf_main.c

+4 −2
Original line number Diff line number Diff line
@@ -3095,8 +3095,10 @@ static int iavf_configure_clsflower(struct iavf_adapter *adapter, 
		return -ENOMEM;



	while (!mutex_trylock(&adapter->crit_lock)) {

		if (--count == 0)

			goto err;

		if (--count == 0) {

			kfree(filter);

			return err;

		}

		udelay(1);

	}