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

Commit 1fc5f038 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Make certain to initialize the fdir_perfect_lock in all cases 



This fix makes it so that the fdir_perfect_lock is initialized in all
cases.  This is necessary as the fdir_filter_exit routine will always
attempt to take the lock before inspecting the filter table.

Reported-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2c670b5b

drivers/net/ixgbe/ixgbe_main.c

+3 −2
Original line number Diff line number Diff line
@@ -5155,8 +5155,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
		adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;

		if (hw->device_id == IXGBE_DEV_ID_82599_T3_LOM)

			adapter->flags2 |= IXGBE_FLAG2_TEMP_SENSOR_CAPABLE;

		/* n-tuple support exists, always init our spinlock */

		spin_lock_init(&adapter->fdir_perfect_lock);

		/* Flow Director hash filters enabled */

		adapter->flags |= IXGBE_FLAG_FDIR_HASH_CAPABLE;

		adapter->atr_sample_rate = 20;
@@ -5177,6 +5175,9 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 
		break;

	}



	/* n-tuple support exists, always init our spinlock */

	spin_lock_init(&adapter->fdir_perfect_lock);



#ifdef CONFIG_IXGBE_DCB

	/* Configure DCB traffic classes */

	for (j = 0; j < MAX_TRAFFIC_CLASS; j++) {