get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/1122937/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 1122937,
    "url": "http://patchwork.ozlabs.org/api/patches/1122937/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190626092027.52845-14-anthony.l.nguyen@intel.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": "<20190626092027.52845-14-anthony.l.nguyen@intel.com>",
    "list_archive_url": null,
    "date": "2019-06-26T09:20:25",
    "name": "[S22,14/16] ice: Remove unnecessary flag ICE_FLAG_MSIX_ENA",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": false,
    "hash": "59c286e043cc3ecfb43016b8045d768eea2fe4e3",
    "submitter": {
        "id": 68875,
        "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api",
        "name": "Tony Nguyen",
        "email": "anthony.l.nguyen@intel.com"
    },
    "delegate": {
        "id": 68,
        "url": "http://patchwork.ozlabs.org/api/users/68/?format=api",
        "username": "jtkirshe",
        "first_name": "Jeff",
        "last_name": "Kirsher",
        "email": "jeffrey.t.kirsher@intel.com"
    },
    "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190626092027.52845-14-anthony.l.nguyen@intel.com/mbox/",
    "series": [
        {
            "id": 116295,
            "url": "http://patchwork.ozlabs.org/api/series/116295/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=116295",
            "date": "2019-06-26T09:20:14",
            "name": "[S22,01/16] ice: add lp_advertising flow control support",
            "version": 1,
            "mbox": "http://patchwork.ozlabs.org/series/116295/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/1122937/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/1122937/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@bilbo.ozlabs.org",
            "intel-wired-lan@lists.osuosl.org"
        ],
        "Authentication-Results": [
            "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)",
            "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com"
        ],
        "Received": [
            "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 45Yr952Nj6z9sCJ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 27 Jun 2019 03:48:09 +1000 (AEST)",
            "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B7ACF8657C;\n\tWed, 26 Jun 2019 17:48:07 +0000 (UTC)",
            "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id NOWhk5qBLAQZ; Wed, 26 Jun 2019 17:48:01 +0000 (UTC)",
            "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B80DF86ACE;\n\tWed, 26 Jun 2019 17:47:58 +0000 (UTC)",
            "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id DD9271BF9B2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 26 Jun 2019 17:47:54 +0000 (UTC)",
            "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D5D5986132\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 26 Jun 2019 17:47:54 +0000 (UTC)",
            "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id OCD_hhcSHRir for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 26 Jun 2019 17:47:53 +0000 (UTC)",
            "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id B985D86168\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 26 Jun 2019 17:47:53 +0000 (UTC)",
            "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t26 Jun 2019 10:47:53 -0700",
            "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga001.fm.intel.com with ESMTP; 26 Jun 2019 10:47:53 -0700"
        ],
        "X-Virus-Scanned": [
            "amavisd-new at osuosl.org",
            "amavisd-new at osuosl.org"
        ],
        "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6",
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.63,420,1557212400\"; d=\"scan'208\";a=\"183218149\"",
        "From": "Tony Nguyen <anthony.l.nguyen@intel.com>",
        "To": "intel-wired-lan@lists.osuosl.org",
        "Date": "Wed, 26 Jun 2019 02:20:25 -0700",
        "Message-Id": "<20190626092027.52845-14-anthony.l.nguyen@intel.com>",
        "X-Mailer": "git-send-email 2.20.1",
        "In-Reply-To": "<20190626092027.52845-1-anthony.l.nguyen@intel.com>",
        "References": "<20190626092027.52845-1-anthony.l.nguyen@intel.com>",
        "MIME-Version": "1.0",
        "Subject": "[Intel-wired-lan] [PATCH S22 14/16] ice: Remove unnecessary flag\n\tICE_FLAG_MSIX_ENA",
        "X-BeenThere": "intel-wired-lan@osuosl.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>",
        "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<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\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>",
        "Cc": "Brett Creeley <brett.creeley@intel.com>",
        "Content-Type": "text/plain; charset=\"us-ascii\"",
        "Content-Transfer-Encoding": "7bit",
        "Errors-To": "intel-wired-lan-bounces@osuosl.org",
        "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>"
    },
    "content": "From: Brett Creeley <brett.creeley@intel.com>\n\nThis flag is not needed and is called every time we re-enable interrupts\nin the hotpath so remove it. Also remove ice_vsi_req_irq() because it\nwas a wrapper function for ice_vsi_req_irq_msix() whose sole purpose was\nchecking the ICE_FLAG_MSIX_ENA flag.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h      |  1 -\n drivers/net/ethernet/intel/ice/ice_lib.c  | 71 +++++++++-------------\n drivers/net/ethernet/intel/ice/ice_main.c | 74 ++++++-----------------\n drivers/net/ethernet/intel/ice/ice_txrx.c |  4 +-\n 4 files changed, 48 insertions(+), 102 deletions(-)",
    "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex ff750c23cb75..0638cbdd495a 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -341,7 +341,6 @@ struct ice_q_vector {\n } ____cacheline_internodealigned_in_smp;\n \n enum ice_pf_flags {\n-\tICE_FLAG_MSIX_ENA,\n \tICE_FLAG_FLTR_SYNC,\n \tICE_FLAG_RSS_ENA,\n \tICE_FLAG_SRIOV_ENA,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 8a40de59f94d..ee8a67b1797d 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1184,12 +1184,7 @@ static int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi)\n \t\treturn -EEXIST;\n \t}\n \n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {\n-\t\tnum_q_vectors = vsi->num_q_vectors;\n-\t} else {\n-\t\terr = -EINVAL;\n-\t\tgoto err_out;\n-\t}\n+\tnum_q_vectors = vsi->num_q_vectors;\n \n \tfor (v_idx = 0; v_idx < num_q_vectors; v_idx++) {\n \t\terr = ice_vsi_alloc_q_vector(vsi, v_idx);\n@@ -1235,9 +1230,6 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi)\n \t\treturn -EEXIST;\n \t}\n \n-\tif (!test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\treturn -ENOENT;\n-\n \tnum_q_vectors = vsi->num_q_vectors;\n \t/* reserve slots from OS requested IRQs */\n \tvsi->base_vector = ice_get_res(pf, pf->irq_tracker, num_q_vectors,\n@@ -2704,39 +2696,36 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)\n {\n \tstruct ice_pf *pf = vsi->back;\n \tint base = vsi->base_vector;\n+\tint i;\n \n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {\n-\t\tint i;\n-\n-\t\tif (!vsi->q_vectors || !vsi->irqs_ready)\n-\t\t\treturn;\n+\tif (!vsi->q_vectors || !vsi->irqs_ready)\n+\t\treturn;\n \n-\t\tice_vsi_release_msix(vsi);\n-\t\tif (vsi->type == ICE_VSI_VF)\n-\t\t\treturn;\n+\tice_vsi_release_msix(vsi);\n+\tif (vsi->type == ICE_VSI_VF)\n+\t\treturn;\n \n-\t\tvsi->irqs_ready = false;\n-\t\tice_for_each_q_vector(vsi, i) {\n-\t\t\tu16 vector = i + base;\n-\t\t\tint irq_num;\n+\tvsi->irqs_ready = false;\n+\tice_for_each_q_vector(vsi, i) {\n+\t\tu16 vector = i + base;\n+\t\tint irq_num;\n \n-\t\t\tirq_num = pf->msix_entries[vector].vector;\n+\t\tirq_num = pf->msix_entries[vector].vector;\n \n-\t\t\t/* free only the irqs that were actually requested */\n-\t\t\tif (!vsi->q_vectors[i] ||\n-\t\t\t    !(vsi->q_vectors[i]->num_ring_tx ||\n-\t\t\t      vsi->q_vectors[i]->num_ring_rx))\n-\t\t\t\tcontinue;\n+\t\t/* free only the irqs that were actually requested */\n+\t\tif (!vsi->q_vectors[i] ||\n+\t\t    !(vsi->q_vectors[i]->num_ring_tx ||\n+\t\t      vsi->q_vectors[i]->num_ring_rx))\n+\t\t\tcontinue;\n \n-\t\t\t/* clear the affinity notifier in the IRQ descriptor */\n-\t\t\tirq_set_affinity_notifier(irq_num, NULL);\n+\t\t/* clear the affinity notifier in the IRQ descriptor */\n+\t\tirq_set_affinity_notifier(irq_num, NULL);\n \n-\t\t\t/* clear the affinity_mask in the IRQ descriptor */\n-\t\t\tirq_set_affinity_hint(irq_num, NULL);\n-\t\t\tsynchronize_irq(irq_num);\n-\t\t\tdevm_free_irq(&pf->pdev->dev, irq_num,\n-\t\t\t\t      vsi->q_vectors[i]);\n-\t\t}\n+\t\t/* clear the affinity_mask in the IRQ descriptor */\n+\t\tirq_set_affinity_hint(irq_num, NULL);\n+\t\tsynchronize_irq(irq_num);\n+\t\tdevm_free_irq(&pf->pdev->dev, irq_num,\n+\t\t\t      vsi->q_vectors[i]);\n \t}\n }\n \n@@ -2915,15 +2904,13 @@ void ice_vsi_dis_irq(struct ice_vsi *vsi)\n \t}\n \n \t/* disable each interrupt */\n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {\n-\t\tice_for_each_q_vector(vsi, i)\n-\t\t\twr32(hw, GLINT_DYN_CTL(vsi->q_vectors[i]->reg_idx), 0);\n+\tice_for_each_q_vector(vsi, i)\n+\t\twr32(hw, GLINT_DYN_CTL(vsi->q_vectors[i]->reg_idx), 0);\n \n-\t\tice_flush(hw);\n+\tice_flush(hw);\n \n-\t\tice_for_each_q_vector(vsi, i)\n-\t\t\tsynchronize_irq(pf->msix_entries[i + base].vector);\n-\t}\n+\tice_for_each_q_vector(vsi, i)\n+\t\tsynchronize_irq(pf->msix_entries[i + base].vector);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 8a506ba943d9..e400a068a840 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -1547,15 +1547,11 @@ static void ice_irq_affinity_release(struct kref __always_unused *ref) {}\n  */\n static int ice_vsi_ena_irq(struct ice_vsi *vsi)\n {\n-\tstruct ice_pf *pf = vsi->back;\n-\tstruct ice_hw *hw = &pf->hw;\n-\n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {\n-\t\tint i;\n+\tstruct ice_hw *hw = &vsi->back->hw;\n+\tint i;\n \n-\t\tice_for_each_q_vector(vsi, i)\n-\t\t\tice_irq_dynamic_ena(hw, vsi, vsi->q_vectors[i]);\n-\t}\n+\tice_for_each_q_vector(vsi, i)\n+\t\tice_irq_dynamic_ena(hw, vsi, vsi->q_vectors[i]);\n \n \tice_flush(hw);\n \treturn 0;\n@@ -2113,7 +2109,7 @@ static void ice_free_irq_msix_misc(struct ice_pf *pf)\n \twr32(hw, PFINT_OICR_ENA, 0);\n \tice_flush(hw);\n \n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags) && pf->msix_entries) {\n+\tif (pf->msix_entries) {\n \t\tsynchronize_irq(pf->msix_entries[pf->oicr_idx].vector);\n \t\tdevm_free_irq(&pf->pdev->dev,\n \t\t\t      pf->msix_entries[pf->oicr_idx].vector, pf);\n@@ -2539,7 +2535,6 @@ static void ice_deinit_pf(struct ice_pf *pf)\n static void ice_init_pf(struct ice_pf *pf)\n {\n \tbitmap_zero(pf->flags, ICE_PF_FLAGS_NBITS);\n-\tset_bit(ICE_FLAG_MSIX_ENA, pf->flags);\n #ifdef CONFIG_PCI_IOV\n \tif (pf->hw.func_caps.common_cap.sr_iov_1_1) {\n \t\tstruct ice_hw *hw = &pf->hw;\n@@ -2639,7 +2634,6 @@ static int ice_ena_msix_range(struct ice_pf *pf)\n \n exit_err:\n \tpf->num_lan_msix = 0;\n-\tclear_bit(ICE_FLAG_MSIX_ENA, pf->flags);\n \treturn err;\n }\n \n@@ -2652,7 +2646,6 @@ static void ice_dis_msix(struct ice_pf *pf)\n \tpci_disable_msix(pf->pdev);\n \tdevm_kfree(&pf->pdev->dev, pf->msix_entries);\n \tpf->msix_entries = NULL;\n-\tclear_bit(ICE_FLAG_MSIX_ENA, pf->flags);\n }\n \n /**\n@@ -2661,8 +2654,7 @@ static void ice_dis_msix(struct ice_pf *pf)\n  */\n static void ice_clear_interrupt_scheme(struct ice_pf *pf)\n {\n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\tice_dis_msix(pf);\n+\tice_dis_msix(pf);\n \n \tif (pf->irq_tracker) {\n \t\tdevm_kfree(&pf->pdev->dev, pf->irq_tracker);\n@@ -2678,10 +2670,7 @@ static int ice_init_interrupt_scheme(struct ice_pf *pf)\n {\n \tint vectors;\n \n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\tvectors = ice_ena_msix_range(pf);\n-\telse\n-\t\treturn -ENODEV;\n+\tvectors = ice_ena_msix_range(pf);\n \n \tif (vectors < 0)\n \t\treturn vectors;\n@@ -2838,12 +2827,10 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t * the misc functionality and queue processing is combined in\n \t * the same vector and that gets setup at open.\n \t */\n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {\n-\t\terr = ice_req_irq_msix_misc(pf);\n-\t\tif (err) {\n-\t\t\tdev_err(dev, \"setup of misc vector failed: %d\\n\", err);\n-\t\t\tgoto err_init_interrupt_unroll;\n-\t\t}\n+\terr = ice_req_irq_msix_misc(pf);\n+\tif (err) {\n+\t\tdev_err(dev, \"setup of misc vector failed: %d\\n\", err);\n+\t\tgoto err_init_interrupt_unroll;\n \t}\n \n \t/* create switch struct for the switch element created by FW on boot */\n@@ -3458,10 +3445,7 @@ static int ice_up_complete(struct ice_vsi *vsi)\n \tstruct ice_pf *pf = vsi->back;\n \tint err;\n \n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\tice_vsi_cfg_msix(vsi);\n-\telse\n-\t\treturn -ENOTSUPP;\n+\tice_vsi_cfg_msix(vsi);\n \n \t/* Enable only Rx rings, Tx rings were enabled by the FW when the\n \t * Tx queue group list was configured and the context bits were\n@@ -3928,24 +3912,6 @@ int ice_vsi_setup_rx_rings(struct ice_vsi *vsi)\n \treturn err;\n }\n \n-/**\n- * ice_vsi_req_irq - Request IRQ from the OS\n- * @vsi: The VSI IRQ is being requested for\n- * @basename: name for the vector\n- *\n- * Return 0 on success and a negative value on error\n- */\n-static int ice_vsi_req_irq(struct ice_vsi *vsi, char *basename)\n-{\n-\tstruct ice_pf *pf = vsi->back;\n-\tint err = -EINVAL;\n-\n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\terr = ice_vsi_req_irq_msix(vsi, basename);\n-\n-\treturn err;\n-}\n-\n /**\n  * ice_vsi_open - Called when a network interface is made active\n  * @vsi: the VSI to open\n@@ -3975,7 +3941,7 @@ static int ice_vsi_open(struct ice_vsi *vsi)\n \n \tsnprintf(int_name, sizeof(int_name) - 1, \"%s-%s\",\n \t\t dev_driver_string(&pf->pdev->dev), vsi->netdev->name);\n-\terr = ice_vsi_req_irq(vsi, int_name);\n+\terr = ice_vsi_req_irq_msix(vsi, int_name);\n \tif (err)\n \t\tgoto err_setup_rx;\n \n@@ -4212,12 +4178,10 @@ static void ice_rebuild(struct ice_pf *pf)\n \t}\n \n \t/* start misc vector */\n-\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags)) {\n-\t\terr = ice_req_irq_msix_misc(pf);\n-\t\tif (err) {\n-\t\t\tdev_err(dev, \"misc vector setup failed: %d\\n\", err);\n-\t\t\tgoto err_vsi_rebuild;\n-\t\t}\n+\terr = ice_req_irq_msix_misc(pf);\n+\tif (err) {\n+\t\tdev_err(dev, \"misc vector setup failed: %d\\n\", err);\n+\t\tgoto err_vsi_rebuild;\n \t}\n \n \t/* restart the VSIs that were rebuilt and running before the reset */\n@@ -4624,9 +4588,7 @@ static void ice_tx_timeout(struct net_device *netdev)\n \t\thead = (rd32(hw, QTX_COMM_HEAD(vsi->txq_map[hung_queue])) &\n \t\t\tQTX_COMM_HEAD_HEAD_M) >> QTX_COMM_HEAD_HEAD_S;\n \t\t/* Read interrupt register */\n-\t\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\t\tval = rd32(hw,\n-\t\t\t\t   GLINT_DYN_CTL(tx_ring->q_vector->reg_idx));\n+\t\tval = rd32(hw, GLINT_DYN_CTL(tx_ring->q_vector->reg_idx));\n \n \t\tnetdev_info(netdev, \"tx_timeout: VSI_num: %d, Q %d, NTC: 0x%x, HW_HEAD: 0x%x, NTU: 0x%x, INT: 0x%x\\n\",\n \t\t\t    vsi->vsi_num, hung_queue, tx_ring->next_to_clean,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 99e453fbdb9d..d9cb7714a792 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -1716,7 +1716,6 @@ int ice_napi_poll(struct napi_struct *napi, int budget)\n \tstruct ice_q_vector *q_vector =\n \t\t\t\tcontainer_of(napi, struct ice_q_vector, napi);\n \tstruct ice_vsi *vsi = q_vector->vsi;\n-\tstruct ice_pf *pf = vsi->back;\n \tbool clean_complete = true;\n \tint budget_per_ring = 0;\n \tstruct ice_ring *ring;\n@@ -1768,8 +1767,7 @@ int ice_napi_poll(struct napi_struct *napi, int budget)\n \t * poll us due to busy-polling\n \t */\n \tif (likely(napi_complete_done(napi, work_done)))\n-\t\tif (test_bit(ICE_FLAG_MSIX_ENA, pf->flags))\n-\t\t\tice_update_ena_itr(vsi, q_vector);\n+\t\tice_update_ena_itr(vsi, q_vector);\n \n \treturn min_t(int, work_done, budget - 1);\n }\n",
    "prefixes": [
        "S22",
        "14/16"
    ]
}