Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2187544/?format=api
{ "id": 2187544, "url": "http://patchwork.ozlabs.org/api/patches/2187544/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20260122085039.1117442-1-aleksandr.loktionov@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": "<20260122085039.1117442-1-aleksandr.loktionov@intel.com>", "list_archive_url": null, "date": "2026-01-22T08:50:39", "name": "[iwl-next,v1] ixgbe: refactor: use DECLARE_BITMAP for ring state field", "commit_ref": null, "pull_url": null, "state": "under-review", "archived": false, "hash": "6b5d9278d4accf7fe8401bd67a0e0b4a7dba8af2", "submitter": { "id": 75597, "url": "http://patchwork.ozlabs.org/api/people/75597/?format=api", "name": "Loktionov, Aleksandr", "email": "aleksandr.loktionov@intel.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/20260122085039.1117442-1-aleksandr.loktionov@intel.com/mbox/", "series": [ { "id": 489338, "url": "http://patchwork.ozlabs.org/api/series/489338/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=489338", "date": "2026-01-22T08:50:39", "name": "[iwl-next,v1] ixgbe: refactor: use DECLARE_BITMAP for ring state field", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/489338/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2187544/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2187544/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=XjO18qC6;\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 4dxZXX3Bhcz1xsN\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 22 Jan 2026 19:50:50 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 0B276836EA;\n\tThu, 22 Jan 2026 08:50:48 +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 ZuPsohcapDT0; Thu, 22 Jan 2026 08:50:47 +0000 (UTC)", "from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp1.osuosl.org (Postfix) with ESMTP id 186F083BF7;\n\tThu, 22 Jan 2026 08:50:47 +0000 (UTC)", "from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137])\n by lists1.osuosl.org (Postfix) with ESMTP id 0F849158\n for <intel-wired-lan@lists.osuosl.org>; Thu, 22 Jan 2026 08:50:46 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp4.osuosl.org (Postfix) with ESMTP id F175342E53\n for <intel-wired-lan@lists.osuosl.org>; Thu, 22 Jan 2026 08:50:45 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id nYOfvUPaFxdZ for <intel-wired-lan@lists.osuosl.org>;\n Thu, 22 Jan 2026 08:50:45 +0000 (UTC)", "from mgamail.intel.com (mgamail.intel.com [192.198.163.13])\n by smtp4.osuosl.org (Postfix) with ESMTPS id 6C9E242E50\n for <intel-wired-lan@lists.osuosl.org>; Thu, 22 Jan 2026 08:50:44 +0000 (UTC)", "from fmviesa007.fm.intel.com ([10.60.135.147])\n by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Jan 2026 00:50:42 -0800", "from amlin-019-225.igk.intel.com ([10.102.19.225])\n by fmviesa007.fm.intel.com with ESMTP; 22 Jan 2026 00:50:40 -0800" ], "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 186F083BF7", "OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6C9E242E50" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1769071847;\n\tbh=xn9N5Tx+tS9RGptnxwPcgRqN795tmKSX2YSJxDICyT0=;\n\th=From:To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive:\n\t List-Post:List-Help:List-Subscribe:From;\n\tb=XjO18qC6Evr+Z/0zlQSusMOv8GxflopTOiC+ENCnMID1A9VryCVzsoePzGn5d+m8u\n\t vfzoBIXwMU31lYGqxPVcVr38el3XxoeJ6M5T+Rf/iCVvUVYOoVxZg1dULM9msgZZ3f\n\t nRx8wPJeiwQBIAe4WZkcXMh3aQ/6UDYIS1J3wPdFBYABZAJyxgVQ34O+KfHoXxmwCW\n\t X3cQJi8XCg8HmVeD5iJPekDpSbRtqx9TctEP/tdrLggFJyXFO0lmpXBaE5RFvhHkD1\n\t jcI3ALfWoi6zUxWIYcSO5e5AHd4PalLFMb79DlJBVcCw9ln3DMELk5DtmbL3vXANQY\n\t o1OlS5AuQP5jw==", "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=192.198.163.13;\n helo=mgamail.intel.com; envelope-from=aleksandr.loktionov@intel.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp4.osuosl.org 6C9E242E50", "X-CSE-ConnectionGUID": [ "w/3QuquNTbSZ8BcW8o975A==", "7ZZlwGf+RDC0oXhZ2QWdDQ==" ], "X-CSE-MsgGUID": [ "nhQxuEXxTqWH8sFOjDknTw==", "NVIyCBkmSZCNHPB93vYxaw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6800,10657,11678\"; a=\"72900698\"", "E=Sophos;i=\"6.21,245,1763452800\"; d=\"scan'208\";a=\"72900698\"", "E=Sophos;i=\"6.21,245,1763452800\"; d=\"scan'208\";a=\"206288995\"" ], "X-ExtLoop1": "1", "From": "Aleksandr Loktionov <aleksandr.loktionov@intel.com>", "To": "intel-wired-lan@lists.osuosl.org, anthony.l.nguyen@intel.com,\n aleksandr.loktionov@intel.com", "Cc": "netdev@vger.kernel.org,\n\tMarcin Szycik <marcin.szycik@linux.intel.com>", "Date": "Thu, 22 Jan 2026 09:50:39 +0100", "Message-ID": "<20260122085039.1117442-1-aleksandr.loktionov@intel.com>", "X-Mailer": "git-send-email 2.52.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Mailman-Original-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1769071844; x=1800607844;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=9l8iEd8bG/xM1ir56TTdn/JzoLQ68vI5QDl6oebT1fg=;\n b=EUPqwl/OZfMgCcJS0tZYtwK2D3Vu66C1GYdjQ5SeyLXwJ6ouOjyMgy3H\n urdhdDaUwmJgLEUpyP4JP5L4FoHMVXwV0Ml1coMU48dBWygisEp/ak4wR\n E9+14nxCCgDK2oVKKIrGNFuj6fFL3V1EgQIYuT3UePp2nw7/D1uTRrPl9\n kG4/0Vpxv4OGkXBvkZtBAcw+3npsQbeTGyhJ5a0OROQR4IlitrwoupGHC\n EV8dciAUqZSxh1ahrfaFYymBLSgSKs0UzlKtaqpGHS4fK5aZQ7t4VA6U8\n 7t4HClY/5ER/DKll4lFCcj3yRc+oxpD4QGBd6vGY/2jo+2T2pY3y16Ykb\n A==;", "X-Mailman-Original-Authentication-Results": [ "smtp4.osuosl.org;\n dmarc=pass (p=none dis=none)\n header.from=intel.com", "smtp4.osuosl.org;\n dkim=pass (2048-bit key,\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=EUPqwl/O" ], "Subject": "[Intel-wired-lan] [PATCH iwl-next v1] ixgbe: refactor: use\n DECLARE_BITMAP for ring state field", "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>", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Convert the ring state field from 'unsigned long' to a proper bitmap\nusing DECLARE_BITMAP macro, aligning with the implementation pattern\nalready used in the i40e driver.\n\nThis change:\n- Adds __IXGBE_RING_STATE_NBITS as the bitmap size sentinel to enum\n ixgbe_ring_state_t (consistent with i40e's __I40E_RING_STATE_NBITS)\n- Changes 'unsigned long state' to 'DECLARE_BITMAP(state,\n __IXGBE_RING_STATE_NBITS)' in struct ixgbe_ring\n- Removes the address-of operator (&) when passing ring->state to bit\n manipulation functions, as bitmap arrays naturally decay to pointers\n\nThe change maintains functional equivalence while using the\nmore appropriate kernel bitmap API, consistent with other Intel Ethernet\ndrivers.\n\nSigned-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>\nReviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe.h | 27 ++++-----\n drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 +-\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 56 +++++++++----------\n drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +-\n 4 files changed, 45 insertions(+), 44 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\nindex dce4936..59a1cee4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h\n@@ -322,49 +322,50 @@ enum ixgbe_ring_state_t {\n \t__IXGBE_HANG_CHECK_ARMED,\n \t__IXGBE_TX_XDP_RING,\n \t__IXGBE_TX_DISABLED,\n+\t__IXGBE_RING_STATE_NBITS, /* must be last */\n };\n \n #define ring_uses_build_skb(ring) \\\n-\ttest_bit(__IXGBE_RX_BUILD_SKB_ENABLED, &(ring)->state)\n+\ttest_bit(__IXGBE_RX_BUILD_SKB_ENABLED, (ring)->state)\n \n struct ixgbe_fwd_adapter {\n \tunsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];\n \tstruct net_device *netdev;\n \tunsigned int tx_base_queue;\n \tunsigned int rx_base_queue;\n \tint pool;\n };\n \n #define check_for_tx_hang(ring) \\\n-\ttest_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)\n+\ttest_bit(__IXGBE_TX_DETECT_HANG, (ring)->state)\n #define set_check_for_tx_hang(ring) \\\n-\tset_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)\n+\tset_bit(__IXGBE_TX_DETECT_HANG, (ring)->state)\n #define clear_check_for_tx_hang(ring) \\\n-\tclear_bit(__IXGBE_TX_DETECT_HANG, &(ring)->state)\n+\tclear_bit(__IXGBE_TX_DETECT_HANG, (ring)->state)\n #define ring_is_rsc_enabled(ring) \\\n-\ttest_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)\n+\ttest_bit(__IXGBE_RX_RSC_ENABLED, (ring)->state)\n #define set_ring_rsc_enabled(ring) \\\n-\tset_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)\n+\tset_bit(__IXGBE_RX_RSC_ENABLED, (ring)->state)\n #define clear_ring_rsc_enabled(ring) \\\n-\tclear_bit(__IXGBE_RX_RSC_ENABLED, &(ring)->state)\n+\tclear_bit(__IXGBE_RX_RSC_ENABLED, (ring)->state)\n #define ring_is_xdp(ring) \\\n-\ttest_bit(__IXGBE_TX_XDP_RING, &(ring)->state)\n+\ttest_bit(__IXGBE_TX_XDP_RING, (ring)->state)\n #define set_ring_xdp(ring) \\\n-\tset_bit(__IXGBE_TX_XDP_RING, &(ring)->state)\n+\tset_bit(__IXGBE_TX_XDP_RING, (ring)->state)\n #define clear_ring_xdp(ring) \\\n-\tclear_bit(__IXGBE_TX_XDP_RING, &(ring)->state)\n+\tclear_bit(__IXGBE_TX_XDP_RING, (ring)->state)\n struct ixgbe_ring {\n \tstruct ixgbe_ring *next;\t/* pointer to next ring in q_vector */\n \tstruct ixgbe_q_vector *q_vector; /* backpointer to host q_vector */\n \tstruct net_device *netdev;\t/* netdev ring belongs to */\n \tstruct bpf_prog *xdp_prog;\n \tstruct device *dev;\t\t/* device for DMA mapping */\n \tvoid *desc;\t\t\t/* descriptor ring memory */\n \tunion {\n \t\tstruct ixgbe_tx_buffer *tx_buffer_info;\n \t\tstruct ixgbe_rx_buffer *rx_buffer_info;\n \t};\n-\tunsigned long state;\n+\tDECLARE_BITMAP(state, __IXGBE_RING_STATE_NBITS);\n \tu8 __iomem *tail;\n \tdma_addr_t dma;\t\t\t/* phys. address of descriptor ring */\n \tunsigned int size;\t\t/* length in bytes */\n@@ -453,19 +454,19 @@ struct ixgbe_ring_feature {\n */\n static inline unsigned int ixgbe_rx_bufsz(struct ixgbe_ring *ring)\n {\n-\tif (test_bit(__IXGBE_RX_3K_BUFFER, &ring->state))\n+\tif (test_bit(__IXGBE_RX_3K_BUFFER, ring->state))\n \t\treturn IXGBE_RXBUFFER_3K;\n #if (PAGE_SIZE < 8192)\n \tif (ring_uses_build_skb(ring))\n \t\treturn IXGBE_MAX_2K_FRAME_BUILD_SKB;\n #endif\n \treturn IXGBE_RXBUFFER_2K;\n }\n \n static inline unsigned int ixgbe_rx_pg_order(struct ixgbe_ring *ring)\n {\n #if (PAGE_SIZE < 8192)\n-\tif (test_bit(__IXGBE_RX_3K_BUFFER, &ring->state))\n+\tif (test_bit(__IXGBE_RX_3K_BUFFER, ring->state))\n \t\treturn 1;\n #endif\n \treturn 0;\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\nindex a1d0491..b5c85c5 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c\n@@ -979,15 +979,15 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter,\n \t\t * can be marked as checksum errors.\n \t\t */\n \t\tif (adapter->hw.mac.type == ixgbe_mac_82599EB)\n-\t\t\tset_bit(__IXGBE_RX_CSUM_UDP_ZERO_ERR, &ring->state);\n+\t\t\tset_bit(__IXGBE_RX_CSUM_UDP_ZERO_ERR, ring->state);\n \n #ifdef IXGBE_FCOE\n \t\tif (adapter->netdev->fcoe_mtu) {\n \t\t\tstruct ixgbe_ring_feature *f;\n \t\t\tf = &adapter->ring_feature[RING_F_FCOE];\n \t\t\tif ((rxr_idx >= f->offset) &&\n \t\t\t (rxr_idx < f->offset + f->indices))\n-\t\t\t\tset_bit(__IXGBE_RX_FCOE, &ring->state);\n+\t\t\t\tset_bit(__IXGBE_RX_FCOE, ring->state);\n \t\t}\n \n #endif /* IXGBE_FCOE */\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 034618e..95cd8d5 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -968,7 +968,7 @@ static void ixgbe_update_xoff_rx_lfc(struct ixgbe_adapter *adapter)\n \n \tfor (i = 0; i < adapter->num_tx_queues; i++)\n \t\tclear_bit(__IXGBE_HANG_CHECK_ARMED,\n-\t\t\t &adapter->tx_ring[i]->state);\n+\t\t\t adapter->tx_ring[i]->state);\n }\n \n static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)\n@@ -1011,15 +1011,15 @@ static void ixgbe_update_xoff_received(struct ixgbe_adapter *adapter)\n \n \t\ttc = tx_ring->dcb_tc;\n \t\tif (xoff[tc])\n-\t\t\tclear_bit(__IXGBE_HANG_CHECK_ARMED, &tx_ring->state);\n+\t\t\tclear_bit(__IXGBE_HANG_CHECK_ARMED, tx_ring->state);\n \t}\n \n \tfor (i = 0; i < adapter->num_xdp_queues; i++) {\n \t\tstruct ixgbe_ring *xdp_ring = adapter->xdp_ring[i];\n \n \t\ttc = xdp_ring->dcb_tc;\n \t\tif (xoff[tc])\n-\t\t\tclear_bit(__IXGBE_HANG_CHECK_ARMED, &xdp_ring->state);\n+\t\t\tclear_bit(__IXGBE_HANG_CHECK_ARMED, xdp_ring->state);\n \t}\n }\n \n@@ -1103,11 +1103,11 @@ static bool ixgbe_check_tx_hang(struct ixgbe_ring *tx_ring)\n \tif (tx_done_old == tx_done && tx_pending)\n \t\t/* make sure it is true for two checks in a row */\n \t\treturn test_and_set_bit(__IXGBE_HANG_CHECK_ARMED,\n-\t\t\t\t\t&tx_ring->state);\n+\t\t\t\t\ttx_ring->state);\n \t/* update completed stats and continue */\n \ttx_ring->tx_stats.tx_done_old = tx_done;\n \t/* reset the countdown */\n-\tclear_bit(__IXGBE_HANG_CHECK_ARMED, &tx_ring->state);\n+\tclear_bit(__IXGBE_HANG_CHECK_ARMED, tx_ring->state);\n \n \treturn false;\n }\n@@ -1660,7 +1660,7 @@ static inline bool ixgbe_rx_is_fcoe(struct ixgbe_ring *ring,\n {\n \t__le16 pkt_info = rx_desc->wb.lower.lo_dword.hs_rss.pkt_info;\n \n-\treturn test_bit(__IXGBE_RX_FCOE, &ring->state) &&\n+\treturn test_bit(__IXGBE_RX_FCOE, ring->state) &&\n \t ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_ETQF_MASK)) ==\n \t\t(cpu_to_le16(IXGBE_ETQF_FILTER_FCOE <<\n \t\t\t IXGBE_RXDADV_PKTTYPE_ETQF_SHIFT)));\n@@ -1708,7 +1708,7 @@ static inline void ixgbe_rx_checksum(struct ixgbe_ring *ring,\n \t\t * checksum errors.\n \t\t */\n \t\tif ((pkt_info & cpu_to_le16(IXGBE_RXDADV_PKTTYPE_UDP)) &&\n-\t\t test_bit(__IXGBE_RX_CSUM_UDP_ZERO_ERR, &ring->state))\n+\t\t test_bit(__IXGBE_RX_CSUM_UDP_ZERO_ERR, ring->state))\n \t\t\treturn;\n \n \t\tring->rx_stats.csum_err++;\n@@ -3526,7 +3526,7 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data)\n \t\t\tfor (i = 0; i < adapter->num_tx_queues; i++) {\n \t\t\t\tstruct ixgbe_ring *ring = adapter->tx_ring[i];\n \t\t\t\tif (test_and_clear_bit(__IXGBE_TX_FDIR_INIT_DONE,\n-\t\t\t\t\t\t &ring->state))\n+\t\t\t\t\t\t ring->state))\n \t\t\t\t\treinit_count++;\n \t\t\t}\n \t\t\tif (reinit_count) {\n@@ -3952,22 +3952,22 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,\n \tif (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE) {\n \t\tring->atr_sample_rate = adapter->atr_sample_rate;\n \t\tring->atr_count = 0;\n-\t\tset_bit(__IXGBE_TX_FDIR_INIT_DONE, &ring->state);\n+\t\tset_bit(__IXGBE_TX_FDIR_INIT_DONE, ring->state);\n \t} else {\n \t\tring->atr_sample_rate = 0;\n \t}\n \n \t/* initialize XPS */\n-\tif (!test_and_set_bit(__IXGBE_TX_XPS_INIT_DONE, &ring->state)) {\n+\tif (!test_and_set_bit(__IXGBE_TX_XPS_INIT_DONE, ring->state)) {\n \t\tstruct ixgbe_q_vector *q_vector = ring->q_vector;\n \n \t\tif (q_vector)\n \t\t\tnetif_set_xps_queue(ring->netdev,\n \t\t\t\t\t &q_vector->affinity_mask,\n \t\t\t\t\t ring->queue_index);\n \t}\n \n-\tclear_bit(__IXGBE_HANG_CHECK_ARMED, &ring->state);\n+\tclear_bit(__IXGBE_HANG_CHECK_ARMED, ring->state);\n \n \t/* reinitialize tx_buffer_info */\n \tmemset(ring->tx_buffer_info, 0,\n@@ -4173,7 +4173,7 @@ static void ixgbe_configure_srrctl(struct ixgbe_adapter *adapter,\n \t\t\tsrrctl |= PAGE_SIZE >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;\n \t\telse\n \t\t\tsrrctl |= xsk_buf_len >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;\n-\t} else if (test_bit(__IXGBE_RX_3K_BUFFER, &rx_ring->state)) {\n+\t} else if (test_bit(__IXGBE_RX_3K_BUFFER, rx_ring->state)) {\n \t\tsrrctl |= IXGBE_RXBUFFER_3K >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;\n \t} else {\n \t\tsrrctl |= IXGBE_RXBUFFER_2K >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;\n@@ -4558,7 +4558,7 @@ void ixgbe_configure_rx_ring(struct ixgbe_adapter *adapter,\n \t\t * higher than the MTU of the PF.\n \t\t */\n \t\tif (ring_uses_build_skb(ring) &&\n-\t\t !test_bit(__IXGBE_RX_3K_BUFFER, &ring->state))\n+\t\t !test_bit(__IXGBE_RX_3K_BUFFER, ring->state))\n \t\t\trxdctl |= IXGBE_MAX_2K_FRAME_BUILD_SKB |\n \t\t\t\t IXGBE_RXDCTL_RLPML_EN;\n #endif\n@@ -4733,27 +4733,27 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)\n \t\trx_ring = adapter->rx_ring[i];\n \n \t\tclear_ring_rsc_enabled(rx_ring);\n-\t\tclear_bit(__IXGBE_RX_3K_BUFFER, &rx_ring->state);\n-\t\tclear_bit(__IXGBE_RX_BUILD_SKB_ENABLED, &rx_ring->state);\n+\t\tclear_bit(__IXGBE_RX_3K_BUFFER, rx_ring->state);\n+\t\tclear_bit(__IXGBE_RX_BUILD_SKB_ENABLED, rx_ring->state);\n \n \t\tif (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)\n \t\t\tset_ring_rsc_enabled(rx_ring);\n \n-\t\tif (test_bit(__IXGBE_RX_FCOE, &rx_ring->state))\n-\t\t\tset_bit(__IXGBE_RX_3K_BUFFER, &rx_ring->state);\n+\t\tif (test_bit(__IXGBE_RX_FCOE, rx_ring->state))\n+\t\t\tset_bit(__IXGBE_RX_3K_BUFFER, rx_ring->state);\n \n \t\tif (adapter->flags2 & IXGBE_FLAG2_RX_LEGACY)\n \t\t\tcontinue;\n \n-\t\tset_bit(__IXGBE_RX_BUILD_SKB_ENABLED, &rx_ring->state);\n+\t\tset_bit(__IXGBE_RX_BUILD_SKB_ENABLED, rx_ring->state);\n \n #if (PAGE_SIZE < 8192)\n \t\tif (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)\n-\t\t\tset_bit(__IXGBE_RX_3K_BUFFER, &rx_ring->state);\n+\t\t\tset_bit(__IXGBE_RX_3K_BUFFER, rx_ring->state);\n \n \t\tif (IXGBE_2K_TOO_SMALL_WITH_PADDING ||\n \t\t (max_frame > (ETH_FRAME_LEN + ETH_FCS_LEN)))\n-\t\t\tset_bit(__IXGBE_RX_3K_BUFFER, &rx_ring->state);\n+\t\t\tset_bit(__IXGBE_RX_3K_BUFFER, rx_ring->state);\n #endif\n \t}\n }\n@@ -7946,10 +7946,10 @@ static void ixgbe_fdir_reinit_subtask(struct ixgbe_adapter *adapter)\n \tif (ixgbe_reinit_fdir_tables_82599(hw) == 0) {\n \t\tfor (i = 0; i < adapter->num_tx_queues; i++)\n \t\t\tset_bit(__IXGBE_TX_FDIR_INIT_DONE,\n-\t\t\t\t&(adapter->tx_ring[i]->state));\n+\t\t\t\tadapter->tx_ring[i]->state);\n \t\tfor (i = 0; i < adapter->num_xdp_queues; i++)\n \t\t\tset_bit(__IXGBE_TX_FDIR_INIT_DONE,\n-\t\t\t\t&adapter->xdp_ring[i]->state);\n+\t\t\t\tadapter->xdp_ring[i]->state);\n \t\t/* re-enable flow director interrupts */\n \t\tIXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_FLOW_DIR);\n \t} else {\n@@ -9490,7 +9490,7 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,\n \t\tixgbe_tx_csum(tx_ring, first, &ipsec_tx);\n \n \t/* add the ATR filter if ATR is on */\n-\tif (test_bit(__IXGBE_TX_FDIR_INIT_DONE, &tx_ring->state))\n+\tif (test_bit(__IXGBE_TX_FDIR_INIT_DONE, tx_ring->state))\n \t\tixgbe_atr(tx_ring, first);\n \n #ifdef IXGBE_FCOE\n@@ -9530,7 +9530,7 @@ static netdev_tx_t __ixgbe_xmit_frame(struct sk_buff *skb,\n \t\treturn NETDEV_TX_OK;\n \n \ttx_ring = ring ? ring : adapter->tx_ring[skb_get_queue_mapping(skb)];\n-\tif (unlikely(test_bit(__IXGBE_TX_DISABLED, &tx_ring->state)))\n+\tif (unlikely(test_bit(__IXGBE_TX_DISABLED, tx_ring->state)))\n \t\treturn NETDEV_TX_BUSY;\n \n \treturn ixgbe_xmit_frame_ring(skb, adapter, tx_ring);\n@@ -11015,7 +11015,7 @@ static int ixgbe_xdp_xmit(struct net_device *dev, int n,\n \tif (unlikely(!ring))\n \t\treturn -ENXIO;\n \n-\tif (unlikely(test_bit(__IXGBE_TX_DISABLED, &ring->state)))\n+\tif (unlikely(test_bit(__IXGBE_TX_DISABLED, ring->state)))\n \t\treturn -ENXIO;\n \n \tif (static_branch_unlikely(&ixgbe_xdp_locking_key))\n@@ -11121,7 +11121,7 @@ static void ixgbe_disable_txr_hw(struct ixgbe_adapter *adapter,\n static void ixgbe_disable_txr(struct ixgbe_adapter *adapter,\n \t\t\t struct ixgbe_ring *tx_ring)\n {\n-\tset_bit(__IXGBE_TX_DISABLED, &tx_ring->state);\n+\tset_bit(__IXGBE_TX_DISABLED, tx_ring->state);\n \tixgbe_disable_txr_hw(adapter, tx_ring);\n }\n \n@@ -11275,9 +11275,9 @@ void ixgbe_txrx_ring_enable(struct ixgbe_adapter *adapter, int ring)\n \t\tixgbe_configure_tx_ring(adapter, xdp_ring);\n \tixgbe_configure_rx_ring(adapter, rx_ring);\n \n-\tclear_bit(__IXGBE_TX_DISABLED, &tx_ring->state);\n+\tclear_bit(__IXGBE_TX_DISABLED, tx_ring->state);\n \tif (xdp_ring)\n-\t\tclear_bit(__IXGBE_TX_DISABLED, &xdp_ring->state);\n+\t\tclear_bit(__IXGBE_TX_DISABLED, xdp_ring->state);\n \n \t/* Rx/Tx/XDP Tx share the same napi context. */\n \tnapi_enable(&rx_ring->q_vector->napi);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\nindex 7b94150..89f96c4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n@@ -524,7 +524,7 @@ int ixgbe_xsk_wakeup(struct net_device *dev, u32 qid, u32 flags)\n \n \tring = adapter->xdp_ring[qid];\n \n-\tif (test_bit(__IXGBE_TX_DISABLED, &ring->state))\n+\tif (test_bit(__IXGBE_TX_DISABLED, ring->state))\n \t\treturn -ENETDOWN;\n \n \tif (!ring->xsk_pool)\n", "prefixes": [ "iwl-next", "v1" ] }