Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2211259/?format=api
{ "id": 2211259, "url": "http://patchwork.ozlabs.org/api/patches/2211259/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260316104209.1285962-3-poros@redhat.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260316104209.1285962-3-poros@redhat.com>", "list_archive_url": null, "date": "2026-03-16T10:42:07", "name": "[iwl-next,2/4] iavf: stop removing VLAN filters from PF on interface down", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "b3bbecf2a2e726dec6e155bcf8fbe0d24a3defed", "submitter": { "id": 74657, "url": "http://patchwork.ozlabs.org/api/people/74657/?format=api", "name": "Petr Oros", "email": "poros@redhat.com" }, "delegate": { "id": 109701, "url": "http://patchwork.ozlabs.org/api/users/109701/?format=api", "username": "anguy11", "first_name": "Anthony", "last_name": "Nguyen", "email": "anthony.l.nguyen@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260316104209.1285962-3-poros@redhat.com/mbox/", "series": [ { "id": 496040, "url": "http://patchwork.ozlabs.org/api/series/496040/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=496040", "date": "2026-03-16T10:42:06", "name": "iavf: fix VLAN filter state machine races", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/496040/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2211259/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2211259/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256\n header.s=default header.b=6hpMGwef;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fZBW05GTXz1xwC\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 16 Mar 2026 21:42:36 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 290A8821F3;\n\tMon, 16 Mar 2026 10:42:33 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id 4e40XWZVuuvD; Mon, 16 Mar 2026 10:42:32 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 675B9821CD;\n\tMon, 16 Mar 2026 10:42:32 +0000 (UTC)", "from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138])\n by lists1.osuosl.org (Postfix) with ESMTP id A623B1B4\n for <intel-wired-lan@lists.osuosl.org>; Mon, 16 Mar 2026 10:42:30 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp1.osuosl.org (Postfix) with ESMTP id A42F4821BE\n for <intel-wired-lan@lists.osuosl.org>; Mon, 16 Mar 2026 10:42:30 +0000 (UTC)", "from smtp1.osuosl.org ([127.0.0.1])\n by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id R3yjI96Dp0Dn for <intel-wired-lan@lists.osuosl.org>;\n Mon, 16 Mar 2026 10:42:29 +0000 (UTC)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by smtp1.osuosl.org (Postfix) with ESMTPS id 8DFDE82143\n for <intel-wired-lan@lists.osuosl.org>; Mon, 16 Mar 2026 10:42:29 +0000 (UTC)", "from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-607-UGzni3mnM6y881BySK1cmQ-1; Mon,\n 16 Mar 2026 06:42:25 -0400", "from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 656F618002CA; Mon, 16 Mar 2026 10:42:23 +0000 (UTC)", "from ShadowPeak.redhat.com (unknown [10.45.224.235])\n by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 592A7180035F; Mon, 16 Mar 2026 10:42:20 +0000 (UTC)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.166.142;\n helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org;\n receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp1.osuosl.org 675B9821CD", "OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8DFDE82143" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1773657752;\n\tbh=HbUia9ToJ4Em68ifvsDotsjzFpaTuyfg9MsB1jiwYJs=;\n\th=From:To:Date:In-Reply-To:References:Subject:List-Id:\n\t List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\t Cc:From;\n\tb=6hpMGwefnSuTGi8MMLO0d0rO31AoY+poxBie+fJwUgbi04GrkytoAU/isrV16Ag87\n\t 95V9OqGyxn65yL7qHnV2ADG8E+GJypLhznKEFBFj8Ik70oqN4Cqqu4xMqMCD8KhCg8\n\t objvkFGl8AthBL8i3UxZIHIx90qwEpf8xz8HL0iYNGTdqMoxnP/MJ0NNWbduMQ6R9m\n\t NRwmkwt5Tcnqc08PS0yaPN/SiJ6ijrunbgejBJfg4dqLadl5ge5MuHJF3B1WLcDRpy\n\t nHyAITMzrmVVut1I1GrjFwI7Ho0NFAgO8Lgm9fe30qmHlQgFmjwKf9Z/WKSmTGz6ga\n\t Y3s4/+byUFEVg==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=170.10.129.124;\n helo=us-smtp-delivery-124.mimecast.com; envelope-from=poros@redhat.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp1.osuosl.org 8DFDE82143", "X-MC-Unique": "UGzni3mnM6y881BySK1cmQ-1", "X-Mimecast-MFC-AGG-ID": "UGzni3mnM6y881BySK1cmQ_1773657743", "From": "Petr Oros <poros@redhat.com>", "To": "netdev@vger.kernel.org", "Date": "Mon, 16 Mar 2026 11:42:07 +0100", "Message-ID": "<20260316104209.1285962-3-poros@redhat.com>", "In-Reply-To": "<20260316104209.1285962-1-poros@redhat.com>", "References": "<20260316104209.1285962-1-poros@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.111", "X-Mimecast-MFC-PROC-ID": "W8Cyct1s4jGdxUwV10g7QPz0TUklomsyvI5bIo8_N0A_1773657743", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com;\n s=mimecast20190719; t=1773657748;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=HbUia9ToJ4Em68ifvsDotsjzFpaTuyfg9MsB1jiwYJs=;\n b=RA8kcl0RM0wlqZzfhLRZVd5eHnpg9agfHqD2lTgXHlZw+nzBmIhj0/uP2yTQa29BhaHI3h\n qF8FfbkMr9a2lvt/16ALDGW36VE+nwbKaUAU37ctkEg3fHBIY1k7u/WOHU6ab0GfhRV06r\n OFBOFmeDTnKfJSSG0RYD7oOcD/sJS6Q=", "X-Mailman-Original-Authentication-Results": [ "smtp1.osuosl.org;\n dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com", "smtp1.osuosl.org;\n dkim=pass (1024-bit key,\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=RA8kcl0R" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next 2/4] iavf: stop removing VLAN\n filters from PF on interface down", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>,\n <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Przemek Kitszel <przemyslaw.kitszel@intel.com>,\n Eric Dumazet <edumazet@google.com>, linux-kernel@vger.kernel.org,\n Andrew Lunn <andrew+netdev@lunn.ch>,\n Tony Nguyen <anthony.l.nguyen@intel.com>,\n intel-wired-lan@lists.osuosl.org, jacob.e.keller@intel.com,\n Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,\n \"David S. Miller\" <davem@davemloft.net>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "When a VF goes down, the driver currently sends DEL_VLAN to the PF for\nevery VLAN filter (ACTIVE -> DISABLE -> send DEL -> INACTIVE), then\nre-adds them all on UP (INACTIVE -> ADD -> send ADD -> ADDING ->\nACTIVE). This round-trip is unnecessary because:\n\n 1. The PF disables the VF's queues via VIRTCHNL_OP_DISABLE_QUEUES,\n which already prevents all RX/TX traffic regardless of VLAN filter\n state.\n\n 2. The VLAN filters remaining in PF HW while the VF is down is\n harmless - packets matching those filters have nowhere to go with\n queues disabled.\n\n 3. The DEL+ADD cycle during down/up creates race windows where the\n VLAN filter list is incomplete. With spoofcheck enabled, the PF\n enables TX VLAN filtering on the first non-zero VLAN add, blocking\n traffic for any VLANs not yet re-added.\n\nRemove the entire DISABLE/INACTIVE state machinery:\n - Remove IAVF_VLAN_DISABLE and IAVF_VLAN_INACTIVE enum values\n - Remove iavf_restore_filters() and its call from iavf_open()\n - Remove VLAN filter handling from iavf_clear_mac_vlan_filters(),\n rename it to iavf_clear_mac_filters()\n - Remove DEL_VLAN_FILTER scheduling from iavf_down()\n - Remove all DISABLE/INACTIVE handling from iavf_del_vlans()\n\nVLAN filters now stay ACTIVE across down/up cycles. Only explicit\nuser removal (ndo_vlan_rx_kill_vid) or PF/VF reset triggers VLAN\nfilter deletion/re-addition.\n\nSigned-off-by: Petr Oros <poros@redhat.com>\n---\n drivers/net/ethernet/intel/iavf/iavf.h | 6 +--\n drivers/net/ethernet/intel/iavf/iavf_main.c | 39 ++-----------------\n .../net/ethernet/intel/iavf/iavf_virtchnl.c | 33 +++-------------\n 3 files changed, 12 insertions(+), 66 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 8e6db72828ae14..1ad00690622c8e 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -159,10 +159,8 @@ enum iavf_vlan_state_t {\n \tIAVF_VLAN_INVALID,\n \tIAVF_VLAN_ADD,\t\t/* filter needs to be added */\n \tIAVF_VLAN_ADDING,\t/* ADD sent to PF, waiting for response */\n-\tIAVF_VLAN_ACTIVE,\t/* filter is accepted by PF */\n-\tIAVF_VLAN_DISABLE,\t/* filter needs to be deleted by PF, then marked INACTIVE */\n-\tIAVF_VLAN_INACTIVE,\t/* filter is inactive, we are in IFF_DOWN */\n-\tIAVF_VLAN_REMOVE,\t/* filter needs to be removed from list */\n+\tIAVF_VLAN_ACTIVE,\t/* PF confirmed, filter is in HW */\n+\tIAVF_VLAN_REMOVE,\t/* filter queued for DEL from PF */\n };\n \n struct iavf_vlan_filter {\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 86c1964f42e101..b38ce496a95c75 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -823,27 +823,6 @@ static void iavf_del_vlan(struct iavf_adapter *adapter, struct iavf_vlan vlan)\n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n }\n \n-/**\n- * iavf_restore_filters\n- * @adapter: board private structure\n- *\n- * Restore existing non MAC filters when VF netdev comes back up\n- **/\n-static void iavf_restore_filters(struct iavf_adapter *adapter)\n-{\n-\tstruct iavf_vlan_filter *f;\n-\n-\t/* re-add all VLAN filters */\n-\tspin_lock_bh(&adapter->mac_vlan_list_lock);\n-\n-\tlist_for_each_entry(f, &adapter->vlan_filter_list, list) {\n-\t\tif (f->state == IAVF_VLAN_INACTIVE)\n-\t\t\tf->state = IAVF_VLAN_ADD;\n-\t}\n-\n-\tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n-\tadapter->aq_required |= IAVF_FLAG_AQ_ADD_VLAN_FILTER;\n-}\n \n /**\n * iavf_get_num_vlans_added - get number of VLANs added\n@@ -1262,13 +1241,12 @@ static void iavf_up_complete(struct iavf_adapter *adapter)\n }\n \n /**\n- * iavf_clear_mac_vlan_filters - Remove mac and vlan filters not sent to PF\n- * yet and mark other to be removed.\n+ * iavf_clear_mac_filters - Remove MAC filters not sent to PF yet and mark\n+ * others to be removed.\n * @adapter: board private structure\n **/\n-static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter)\n+static void iavf_clear_mac_filters(struct iavf_adapter *adapter)\n {\n-\tstruct iavf_vlan_filter *vlf, *vlftmp;\n \tstruct iavf_mac_filter *f, *ftmp;\n \n \tspin_lock_bh(&adapter->mac_vlan_list_lock);\n@@ -1287,11 +1265,6 @@ static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter)\n \t\t}\n \t}\n \n-\t/* disable all VLAN filters */\n-\tlist_for_each_entry_safe(vlf, vlftmp, &adapter->vlan_filter_list,\n-\t\t\t\t list)\n-\t\tvlf->state = IAVF_VLAN_DISABLE;\n-\n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n }\n \n@@ -1387,7 +1360,7 @@ void iavf_down(struct iavf_adapter *adapter)\n \tiavf_napi_disable_all(adapter);\n \tiavf_irq_disable(adapter);\n \n-\tiavf_clear_mac_vlan_filters(adapter);\n+\tiavf_clear_mac_filters(adapter);\n \tiavf_clear_cloud_filters(adapter);\n \tiavf_clear_fdir_filters(adapter);\n \tiavf_clear_adv_rss_conf(adapter);\n@@ -1404,8 +1377,6 @@ void iavf_down(struct iavf_adapter *adapter)\n \t\t */\n \t\tif (!list_empty(&adapter->mac_filter_list))\n \t\t\tadapter->aq_required |= IAVF_FLAG_AQ_DEL_MAC_FILTER;\n-\t\tif (!list_empty(&adapter->vlan_filter_list))\n-\t\t\tadapter->aq_required |= IAVF_FLAG_AQ_DEL_VLAN_FILTER;\n \t\tif (!list_empty(&adapter->cloud_filter_list))\n \t\t\tadapter->aq_required |= IAVF_FLAG_AQ_DEL_CLOUD_FILTER;\n \t\tif (!list_empty(&adapter->fdir_list_head))\n@@ -4502,8 +4473,6 @@ static int iavf_open(struct net_device *netdev)\n \tiavf_add_filter(adapter, adapter->hw.mac.addr);\n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n \n-\t/* Restore filters that were removed with IFF_DOWN */\n-\tiavf_restore_filters(adapter);\n \tiavf_restore_fdir_filters(adapter);\n \n \tiavf_configure(adapter);\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex 5114934fe81fa6..d62c0d6394149e 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -911,22 +911,12 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \tspin_lock_bh(&adapter->mac_vlan_list_lock);\n \n \tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {\n-\t\t/* since VLAN capabilities are not allowed, we dont want to send\n-\t\t * a VLAN delete request because it will most likely fail and\n-\t\t * create unnecessary errors/noise, so just free the VLAN\n-\t\t * filters marked for removal to enable bailing out before\n-\t\t * sending a virtchnl message\n-\t\t */\n \t\tif (f->state == IAVF_VLAN_REMOVE &&\n \t\t !VLAN_FILTERING_ALLOWED(adapter)) {\n \t\t\tlist_del(&f->list);\n \t\t\tkfree(f);\n \t\t\tadapter->num_vlan_filters--;\n-\t\t} else if (f->state == IAVF_VLAN_DISABLE &&\n-\t\t !VLAN_FILTERING_ALLOWED(adapter)) {\n-\t\t\tf->state = IAVF_VLAN_INACTIVE;\n-\t\t} else if (f->state == IAVF_VLAN_REMOVE ||\n-\t\t\t f->state == IAVF_VLAN_DISABLE) {\n+\t\t} else if (f->state == IAVF_VLAN_REMOVE) {\n \t\t\tcount++;\n \t\t}\n \t}\n@@ -959,13 +949,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \t\tvvfl->vsi_id = adapter->vsi_res->vsi_id;\n \t\tvvfl->num_elements = count;\n \t\tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {\n-\t\t\tif (f->state == IAVF_VLAN_DISABLE) {\n-\t\t\t\tvvfl->vlan_id[i] = f->vlan.vid;\n-\t\t\t\tf->state = IAVF_VLAN_INACTIVE;\n-\t\t\t\ti++;\n-\t\t\t\tif (i == count)\n-\t\t\t\t\tbreak;\n-\t\t\t} else if (f->state == IAVF_VLAN_REMOVE) {\n+\t\t\tif (f->state == IAVF_VLAN_REMOVE) {\n \t\t\t\tvvfl->vlan_id[i] = f->vlan.vid;\n \t\t\t\tlist_del(&f->list);\n \t\t\t\tkfree(f);\n@@ -1007,8 +991,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \t\tvvfl_v2->vport_id = adapter->vsi_res->vsi_id;\n \t\tvvfl_v2->num_elements = count;\n \t\tlist_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {\n-\t\t\tif (f->state == IAVF_VLAN_DISABLE ||\n-\t\t\t f->state == IAVF_VLAN_REMOVE) {\n+\t\t\tif (f->state == IAVF_VLAN_REMOVE) {\n \t\t\t\tstruct virtchnl_vlan_supported_caps *filtering_support =\n \t\t\t\t\t&adapter->vlan_v2_caps.filtering.filtering_support;\n \t\t\t\tstruct virtchnl_vlan *vlan;\n@@ -1022,13 +1005,9 @@ void iavf_del_vlans(struct iavf_adapter *adapter)\n \t\t\t\tvlan->tci = f->vlan.vid;\n \t\t\t\tvlan->tpid = f->vlan.tpid;\n \n-\t\t\t\tif (f->state == IAVF_VLAN_DISABLE) {\n-\t\t\t\t\tf->state = IAVF_VLAN_INACTIVE;\n-\t\t\t\t} else {\n-\t\t\t\t\tlist_del(&f->list);\n-\t\t\t\t\tkfree(f);\n-\t\t\t\t\tadapter->num_vlan_filters--;\n-\t\t\t\t}\n+\t\t\t\tlist_del(&f->list);\n+\t\t\t\tkfree(f);\n+\t\t\t\tadapter->num_vlan_filters--;\n \t\t\t\ti++;\n \t\t\t\tif (i == count)\n \t\t\t\t\tbreak;\n", "prefixes": [ "iwl-next", "2/4" ] }