Commit 70d62b66 authored by Petr Oros's avatar Petr Oros Committed by Paolo Abeni
Browse files

iavf: rename IAVF_VLAN_IS_NEW to IAVF_VLAN_ADDING 



Rename the IAVF_VLAN_IS_NEW state to IAVF_VLAN_ADDING to better
describe what the state represents: an ADD request has been sent to
the PF and is waiting for a response.

This is a pure rename with no behavioral change, preparing for a
cleanup of the VLAN filter state machine.

Signed-off-by: default avatarPetr Oros <poros@redhat.com>
Reviewed-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: default avatarRafal Romanowski <rafal.romanowski@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20260427-jk-iwl-net-petr-oros-fixes-v1-1-cdcb48303fd8@intel.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 5ef34361

drivers/net/ethernet/intel/iavf/iavf.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct iavf_vlan { 
enum iavf_vlan_state_t {

	IAVF_VLAN_INVALID,

	IAVF_VLAN_ADD,		/* filter needs to be added */

	IAVF_VLAN_IS_NEW,	/* filter is new, wait for PF answer */

	IAVF_VLAN_ADDING,	/* ADD sent to PF, waiting for response */

	IAVF_VLAN_ACTIVE,	/* filter is accepted by PF */

	IAVF_VLAN_DISABLE,	/* filter needs to be deleted by PF, then marked INACTIVE */

	IAVF_VLAN_INACTIVE,	/* filter is inactive, we are in IFF_DOWN */

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

+4 −4
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void iavf_vlan_add_reject(struct iavf_adapter *adapter) 


	spin_lock_bh(&adapter->mac_vlan_list_lock);

	list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {

		if (f->state == IAVF_VLAN_IS_NEW) {

		if (f->state == IAVF_VLAN_ADDING) {

			list_del(&f->list);

			kfree(f);

			adapter->num_vlan_filters--;
@@ -812,7 +812,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) 
			if (f->state == IAVF_VLAN_ADD) {

				vvfl->vlan_id[i] = f->vlan.vid;

				i++;

				f->state = IAVF_VLAN_IS_NEW;

				f->state = IAVF_VLAN_ADDING;

				if (i == count)

					break;

			}
@@ -874,7 +874,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) 
				vlan->tpid = f->vlan.tpid;



				i++;

				f->state = IAVF_VLAN_IS_NEW;

				f->state = IAVF_VLAN_ADDING;

			}

		}
@@ -2910,7 +2910,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, 


		spin_lock_bh(&adapter->mac_vlan_list_lock);

		list_for_each_entry(f, &adapter->vlan_filter_list, list) {

			if (f->state == IAVF_VLAN_IS_NEW)

			if (f->state == IAVF_VLAN_ADDING)

				f->state = IAVF_VLAN_ACTIVE;

		}

		spin_unlock_bh(&adapter->mac_vlan_list_lock);