Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/722744/?format=api
{ "id": 722744, "url": "http://patchwork.ozlabs.org/api/patches/722744/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1486016013-11773-1-git-send-email-bimmy.pujari@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": "<1486016013-11773-1-git-send-email-bimmy.pujari@intel.com>", "list_archive_url": null, "date": "2017-02-02T06:13:33", "name": "[next,S60,1/1] i40e: rename auto_disable_flags to hw_disabled_flags", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "3bfd5f4c08bc8a5ada6b65edebf609cd5e043a42", "submitter": { "id": 68919, "url": "http://patchwork.ozlabs.org/api/people/68919/?format=api", "name": "Pujari, Bimmy", "email": "bimmy.pujari@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/1486016013-11773-1-git-send-email-bimmy.pujari@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/722744/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/722744/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3vDSrC2vyjz9ryn\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 2 Feb 2017 16:15:39 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E281E89EAE;\n\tThu, 2 Feb 2017 05:15:37 +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 hNlIUrOGaCRb; Thu, 2 Feb 2017 05:15:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 558F289E8E;\n\tThu, 2 Feb 2017 05:15:36 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 246F51C0496\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Feb 2017 05:15:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 1AE0E2E497\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Feb 2017 05:15:35 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id BY-d3l2lDtkN for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Feb 2017 05:15:33 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 921282308F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 2 Feb 2017 05:15:33 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga104.jf.intel.com with ESMTP; 01 Feb 2017 21:15:32 -0800", "from bimmy.jf.intel.com (HELO bimmy.linux1.jf.intel.com)\n\t([134.134.2.167])\n\tby fmsmga002.fm.intel.com with ESMTP; 01 Feb 2017 21:15:32 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.33,323,1477983600\"; d=\"scan'208\";\n\ta=\"1120998773\"", "From": "Bimmy Pujari <bimmy.pujari@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 1 Feb 2017 22:13:33 -0800", "Message-Id": "<1486016013-11773-1-git-send-email-bimmy.pujari@intel.com>", "X-Mailer": "git-send-email 2.4.11", "Subject": "[Intel-wired-lan] [next PATCH S60 1/1] i40e: rename\n\tauto_disable_flags to hw_disabled_flags", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>\n\nA previous commit introduced a field that tracks the features\nthat are disabled due to HW resource limitations as opposed\nto the featured disabled by the user. This patch changes the\nname of the field to make it more readable since it might get\nconfusing when looking at code containing both the flags\nfield and the auto_disable_features field together.\n\nSigned-off-by: Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>\nChange-ID: Idcc9888659698f6fe3ccff17c8c3f09b5026f708\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 8 ++++++--\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 ++++-----\n drivers/net/ethernet/intel/i40e/i40e_main.c | 28 +++++++++++++-------------\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 20 +++++++++---------\n 4 files changed, 35 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 1edd351..756595d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -396,8 +396,12 @@ struct i40e_pf {\n #define I40E_FLAG_CLIENT_L2_CHANGE\t\tBIT_ULL(56)\n #define I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE\t\tBIT_ULL(57)\n \n-\t/* tracks features that get auto disabled by errors */\n-\tu64 auto_disable_flags;\n+ /* Tracks features that are disabled due to hw limitations.\n+\t* If a bit is set here, it means that the corresponding\n+\t* bit in the 'flags' field is cleared i.e that feature\n+\t* is disabled\n+\t*/\n+\tu64 hw_disabled_flags;\n \n #ifdef I40E_FCOE\n \tstruct i40e_fcoe fcoe;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex b852ba3..365d855 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -2721,7 +2721,7 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,\n \tif (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))\n \t\treturn -EOPNOTSUPP;\n \n-\tif (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)\n+\tif (pf->hw_disabled_flags & I40E_FLAG_FD_SB_ENABLED)\n \t\treturn -ENOSPC;\n \n \tif (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))\n@@ -3066,7 +3066,7 @@ static u32 i40e_get_priv_flags(struct net_device *dev)\n \t\tI40E_PRIV_FLAGS_FD_ATR : 0;\n \tret_flags |= pf->flags & I40E_FLAG_VEB_STATS_ENABLED ?\n \t\tI40E_PRIV_FLAGS_VEB_STATS : 0;\n-\tret_flags |= pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE ?\n+\tret_flags |= pf->hw_disabled_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE ?\n \t\t0 : I40E_PRIV_FLAGS_HW_ATR_EVICT;\n \tif (pf->hw.pf_id == 0) {\n \t\tret_flags |= pf->flags & I40E_FLAG_TRUE_PROMISC_SUPPORT ?\n@@ -3106,7 +3106,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\tpf->flags |= I40E_FLAG_FD_ATR_ENABLED;\n \t} else {\n \t\tpf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n-\t\tpf->auto_disable_flags |= I40E_FLAG_FD_ATR_ENABLED;\n+\t\tpf->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;\n \n \t\t/* flush current ATR settings */\n \t\tset_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);\n@@ -3151,9 +3151,9 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \n \tif ((flags & I40E_PRIV_FLAGS_HW_ATR_EVICT) &&\n \t (pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE))\n-\t\tpf->auto_disable_flags &= ~I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\t\tpf->hw_disabled_flags &= ~I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n \telse\n-\t\tpf->auto_disable_flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\t\tpf->hw_disabled_flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n \n \t/* if needed, issue reset to cause things to take effect */\n \tif (reset_required)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 840f04b..f2e87d07 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -1114,13 +1114,13 @@ static void i40e_update_pf_stats(struct i40e_pf *pf)\n \t\t\t &osd->rx_lpi_count, &nsd->rx_lpi_count);\n \n \tif (pf->flags & I40E_FLAG_FD_SB_ENABLED &&\n-\t !(pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED))\n+\t !(pf->hw_disabled_flags & I40E_FLAG_FD_SB_ENABLED))\n \t\tnsd->fd_sb_status = true;\n \telse\n \t\tnsd->fd_sb_status = false;\n \n \tif (pf->flags & I40E_FLAG_FD_ATR_ENABLED &&\n-\t !(pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED))\n+\t !(pf->hw_disabled_flags & I40E_FLAG_FD_ATR_ENABLED))\n \t\tnsd->fd_atr_status = true;\n \telse\n \t\tnsd->fd_atr_status = false;\n@@ -5609,7 +5609,7 @@ static int i40e_up_complete(struct i40e_vsi *vsi)\n \t\t/* reset fd counters */\n \t\tpf->fd_add_err = pf->fd_atr_cnt = 0;\n \t\tif (pf->fd_tcp_rule > 0) {\n-\t\t\tpf->auto_disable_flags |= I40E_FLAG_FD_ATR_ENABLED;\n+\t\t\tpf->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;\n \t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\t\tdev_info(&pf->pdev->dev, \"Forcing ATR off, sideband rules for TCP/IPv4 exist\\n\");\n \t\t\tpf->fd_tcp_rule = 0;\n@@ -6306,8 +6306,8 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf)\n \t (pf->fd_add_err == 0) ||\n \t (i40e_get_current_atr_cnt(pf) < pf->fd_atr_cnt)) {\n \t\tif ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&\n-\t\t (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {\n-\t\t\tpf->auto_disable_flags &= ~I40E_FLAG_FD_SB_ENABLED;\n+\t\t (pf->hw_disabled_flags & I40E_FLAG_FD_SB_ENABLED)) {\n+\t\t\tpf->hw_disabled_flags &= ~I40E_FLAG_FD_SB_ENABLED;\n \t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\t\tdev_info(&pf->pdev->dev, \"FD Sideband/ntuple is being enabled since we have space in the table now\\n\");\n \t\t}\n@@ -6318,9 +6318,9 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf)\n \t */\n \tif (fcnt_prog < (fcnt_avail - I40E_FDIR_BUFFER_HEAD_ROOM * 2)) {\n \t\tif ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&\n-\t\t (pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED) &&\n+\t\t (pf->hw_disabled_flags & I40E_FLAG_FD_ATR_ENABLED) &&\n \t\t (pf->fd_tcp_rule == 0)) {\n-\t\t\tpf->auto_disable_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n+\t\t\tpf->hw_disabled_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n \t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\t\tdev_info(&pf->pdev->dev, \"ATR is being enabled since we have space in the table and there are no conflicting ntuple rules\\n\");\n \t\t}\n@@ -6372,7 +6372,7 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf)\n \t}\n \n \tpf->fd_flush_timestamp = jiffies;\n-\tpf->auto_disable_flags |= I40E_FLAG_FD_ATR_ENABLED;\n+\tpf->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;\n \t/* flush all filters */\n \twr32(&pf->hw, I40E_PFQF_CTL_1,\n \t I40E_PFQF_CTL_1_CLEARFDTABLE_MASK);\n@@ -6392,7 +6392,7 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf)\n \t\t/* replay sideband filters */\n \t\ti40e_fdir_filter_restore(pf->vsi[pf->lan_vsi]);\n \t\tif (!disable_atr)\n-\t\t\tpf->auto_disable_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n+\t\t\tpf->hw_disabled_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n \t\tclear_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);\n \t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\tdev_info(&pf->pdev->dev, \"FD Filter table flushed and FD-SB replayed.\\n\");\n@@ -9082,9 +9082,9 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t\t (pf->hw.aq.api_min_ver > 4))) {\n \t\t/* Supported in FW API version higher than 1.4 */\n \t\tpf->flags |= I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n-\t\tpf->auto_disable_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\t\tpf->hw_disabled_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n \t} else {\n-\t\tpf->auto_disable_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n+\t\tpf->hw_disabled_flags = I40E_FLAG_HW_ATR_EVICT_CAPABLE;\n \t}\n \n \tpf->eeprom_version = 0xDEAD;\n@@ -9146,14 +9146,14 @@ bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features)\n \t\t\ti40e_cloud_filter_exit(pf);\n \t\t}\n \t\tpf->flags &= ~I40E_FLAG_FD_SB_ENABLED;\n-\t\tpf->auto_disable_flags &= ~I40E_FLAG_FD_SB_ENABLED;\n+\t\tpf->hw_disabled_flags &= ~I40E_FLAG_FD_SB_ENABLED;\n \t\t/* reset fd counters */\n \t\tpf->fd_add_err = pf->fd_atr_cnt = pf->fd_tcp_rule = 0;\n \t\tpf->fdir_pf_active_filters = 0;\n \t\t/* if ATR was auto disabled it can be re-enabled. */\n \t\tif ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&\n-\t\t (pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED)) {\n-\t\t\tpf->auto_disable_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n+\t\t (pf->hw_disabled_flags & I40E_FLAG_FD_ATR_ENABLED)) {\n+\t\t\tpf->hw_disabled_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n \t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\t\tdev_info(&pf->pdev->dev, \"ATR re-enabled.\\n\");\n \t\t}\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 012c157..3a2fd66 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -292,7 +292,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,\n \t\tif ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&\n \t\t I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\tdev_info(&pf->pdev->dev, \"Forcing ATR off, sideband rules for TCP/IPv4 flow being applied\\n\");\n-\t\tpf->auto_disable_flags |= I40E_FLAG_FD_ATR_ENABLED;\n+\t\tpf->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;\n \t} else {\n \t\tpf->fd_tcp_rule = (pf->fd_tcp_rule > 0) ?\n \t\t\t\t (pf->fd_tcp_rule - 1) : 0;\n@@ -300,7 +300,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,\n \t\t\tif ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&\n \t\t\t I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\t\tdev_info(&pf->pdev->dev, \"ATR re-enabled due to no sideband TCP/IPv4 rules\\n\");\n-\t\t\tpf->auto_disable_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n+\t\t\tpf->hw_disabled_flags &= ~I40E_FLAG_FD_ATR_ENABLED;\n \t\t}\n \t}\n \n@@ -485,8 +485,8 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,\n \t\tpf->fd_atr_cnt = i40e_get_current_atr_cnt(pf);\n \n \t\tif ((rx_desc->wb.qword0.hi_dword.fd_id == 0) &&\n-\t\t (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {\n-\t\t\tpf->auto_disable_flags |= I40E_FLAG_FD_ATR_ENABLED;\n+\t\t (pf->hw_disabled_flags & I40E_FLAG_FD_SB_ENABLED)) {\n+\t\t\tpf->hw_disabled_flags |= I40E_FLAG_FD_ATR_ENABLED;\n \t\t\tset_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);\n \t\t}\n \n@@ -499,11 +499,11 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,\n \t\t */\n \t\tif (fcnt_prog >= (fcnt_avail - I40E_FDIR_BUFFER_FULL_MARGIN)) {\n \t\t\tif ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&\n-\t\t\t !(pf->auto_disable_flags &\n+\t\t\t !(pf->hw_disabled_flags &\n \t\t\t\t I40E_FLAG_FD_SB_ENABLED)) {\n \t\t\t\tif (I40E_DEBUG_FD & pf->hw.debug_mask)\n \t\t\t\t\tdev_warn(&pdev->dev, \"FD filter space full, new ntuple rules will not be added\\n\");\n-\t\t\t\tpf->auto_disable_flags |=\n+\t\t\t\tpf->hw_disabled_flags |=\n \t\t\t\t\t\t\tI40E_FLAG_FD_SB_ENABLED;\n \t\t\t}\n \t\t}\n@@ -2465,7 +2465,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \tif (!(pf->flags & I40E_FLAG_FD_ATR_ENABLED))\n \t\treturn;\n \n-\tif ((pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED))\n+\tif ((pf->hw_disabled_flags & I40E_FLAG_FD_ATR_ENABLED))\n \t\treturn;\n \n \t/* if sampling is disabled do nothing */\n@@ -2499,10 +2499,10 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \tth = (struct tcphdr *)(hdr.network + hlen);\n \n \t/* Due to lack of space, no more new filters can be programmed */\n-\tif (th->syn && (pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED))\n+\tif (th->syn && (pf->hw_disabled_flags & I40E_FLAG_FD_ATR_ENABLED))\n \t\treturn;\n \tif ((pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) &&\n-\t (!(pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE))) {\n+\t (!(pf->hw_disabled_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE))) {\n \t\t/* HW ATR eviction will take care of removing filters on FIN\n \t\t * and RST packets.\n \t\t */\n@@ -2565,7 +2565,7 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,\n \t\t\tI40E_TXD_FLTR_QW1_CNTINDEX_MASK;\n \n \tif ((pf->flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE) &&\n-\t (!(pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE)))\n+\t (!(pf->hw_disabled_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE)))\n \t\tdtype_cmd |= I40E_TXD_FLTR_QW1_ATR_MASK;\n \n \tfdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);\n", "prefixes": [ "next", "S60", "1/1" ] }