tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Petr Oros <poros@redhat.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Jacob 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: Paolo Abeni <pabeni@redhat.com>

authored by

Petr Oros and committed by
Paolo Abeni 70d62b66 5ef34361

+5 -5
+1 -1
drivers/net/ethernet/intel/iavf/iavf.h
··· 158 158 enum iavf_vlan_state_t { 159 159 IAVF_VLAN_INVALID, 160 160 IAVF_VLAN_ADD, /* filter needs to be added */ 161 - IAVF_VLAN_IS_NEW, /* filter is new, wait for PF answer */ 161 + IAVF_VLAN_ADDING, /* ADD sent to PF, waiting for response */ 162 162 IAVF_VLAN_ACTIVE, /* filter is accepted by PF */ 163 163 IAVF_VLAN_DISABLE, /* filter needs to be deleted by PF, then marked INACTIVE */ 164 164 IAVF_VLAN_INACTIVE, /* filter is inactive, we are in IFF_DOWN */
+4 -4
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
··· 746 746 747 747 spin_lock_bh(&adapter->mac_vlan_list_lock); 748 748 list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) { 749 - if (f->state == IAVF_VLAN_IS_NEW) { 749 + if (f->state == IAVF_VLAN_ADDING) { 750 750 list_del(&f->list); 751 751 kfree(f); 752 752 adapter->num_vlan_filters--; ··· 812 812 if (f->state == IAVF_VLAN_ADD) { 813 813 vvfl->vlan_id[i] = f->vlan.vid; 814 814 i++; 815 - f->state = IAVF_VLAN_IS_NEW; 815 + f->state = IAVF_VLAN_ADDING; 816 816 if (i == count) 817 817 break; 818 818 } ··· 874 874 vlan->tpid = f->vlan.tpid; 875 875 876 876 i++; 877 - f->state = IAVF_VLAN_IS_NEW; 877 + f->state = IAVF_VLAN_ADDING; 878 878 } 879 879 } 880 880 ··· 2910 2910 2911 2911 spin_lock_bh(&adapter->mac_vlan_list_lock); 2912 2912 list_for_each_entry(f, &adapter->vlan_filter_list, list) { 2913 - if (f->state == IAVF_VLAN_IS_NEW) 2913 + if (f->state == IAVF_VLAN_ADDING) 2914 2914 f->state = IAVF_VLAN_ACTIVE; 2915 2915 } 2916 2916 spin_unlock_bh(&adapter->mac_vlan_list_lock);