Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/714711/?format=api
{ "id": 714711, "url": "http://patchwork.ozlabs.org/api/patches/714711/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170112235942.5767-2-jacob.e.keller@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": "<20170112235942.5767-2-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-01-12T23:59:39", "name": "[2/5] fm10k: future-proof state bitmaps using DECLARE_BITMAP", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a3bd25f079aa1446f083ef681b38f8a1855e6a2b", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20170112235942.5767-2-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/714711/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/714711/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3v02n51ks4z9srY\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 13 Jan 2017 10:59:53 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C552584771;\n\tThu, 12 Jan 2017 23:59:51 +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 GOd8cb8mF6DP; Thu, 12 Jan 2017 23:59:50 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D7DD385E20;\n\tThu, 12 Jan 2017 23:59:49 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 462C41BFF71\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Jan 2017 23:59:47 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 40CCF2E122\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Jan 2017 23:59:47 +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 n1K9eEp1ue8I for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Jan 2017 23:59:45 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 509422E0FC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 12 Jan 2017 23:59:45 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP; 12 Jan 2017 15:59:44 -0800", "from jekeller-desk.amr.corp.intel.com ([10.166.35.174])\n\tby fmsmga001.fm.intel.com with ESMTP; 12 Jan 2017 15:59:44 -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,220,1477983600\"; d=\"scan'208\";\n\ta=\"1093430201\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 12 Jan 2017 15:59:39 -0800", "Message-Id": "<20170112235942.5767-2-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.11.0.403.g196674b8396b", "In-Reply-To": "<20170112235942.5767-1-jacob.e.keller@intel.com>", "References": "<20170112235942.5767-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 2/5] fm10k: future-proof state bitmaps\n\tusing DECLARE_BITMAP", "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": "This ensures that future programmers do not have to remember to re-size\nthe bitmaps due to adding new values. Although this is unlikely for this\ndriver, it may happen and it's best to prevent it from ever being an\nissue.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 40 ++++++++-------\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 4 +-\n drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 ++--\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 62 ++++++++++++------------\n 5 files changed, 61 insertions(+), 57 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex d6db1c48d4dc..b496300d0268 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -65,14 +65,16 @@ enum fm10k_ring_state_t {\n \t__FM10K_TX_DETECT_HANG,\n \t__FM10K_HANG_CHECK_ARMED,\n \t__FM10K_TX_XPS_INIT_DONE,\n+\t/* This must be last and is used to calculate BITMAP size */\n+\t__FM10K_TX_STATE_SIZE__,\n };\n \n #define check_for_tx_hang(ring) \\\n-\ttest_bit(__FM10K_TX_DETECT_HANG, &(ring)->state)\n+\ttest_bit(__FM10K_TX_DETECT_HANG, (ring)->state)\n #define set_check_for_tx_hang(ring) \\\n-\tset_bit(__FM10K_TX_DETECT_HANG, &(ring)->state)\n+\tset_bit(__FM10K_TX_DETECT_HANG, (ring)->state)\n #define clear_check_for_tx_hang(ring) \\\n-\tclear_bit(__FM10K_TX_DETECT_HANG, &(ring)->state)\n+\tclear_bit(__FM10K_TX_DETECT_HANG, (ring)->state)\n \n struct fm10k_tx_buffer {\n \tstruct fm10k_tx_desc *next_to_watch;\n@@ -126,7 +128,7 @@ struct fm10k_ring {\n \t\tstruct fm10k_rx_buffer *rx_buffer;\n \t};\n \tu32 __iomem *tail;\n-\tunsigned long state;\n+\tDECLARE_BITMAP(state, __FM10K_TX_STATE_SIZE__);\n \tdma_addr_t dma;\t\t\t/* phys. address of descriptor ring */\n \tunsigned int size;\t\t/* length in bytes */\n \n@@ -266,12 +268,24 @@ enum fm10k_flags_t {\n \t__FM10K_FLAGS_SIZE__\n };\n \n+enum fm10k_state_t {\n+\t__FM10K_RESETTING,\n+\t__FM10K_DOWN,\n+\t__FM10K_SERVICE_SCHED,\n+\t__FM10K_SERVICE_DISABLE,\n+\t__FM10K_MBX_LOCK,\n+\t__FM10K_LINK_DOWN,\n+\t__FM10K_UPDATING_STATS,\n+\t/* This value must be last and determines the BITMAP size */\n+\t__FM10K_STATE_SIZE__,\n+};\n+\n struct fm10k_intfc {\n \tunsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];\n \tstruct net_device *netdev;\n \tstruct fm10k_l2_accel *l2_accel; /* pointer to L2 acceleration list */\n \tstruct pci_dev *pdev;\n-\tunsigned long state;\n+\tDECLARE_BITMAP(state, __FM10K_STATE_SIZE__);\n \n \t/* Access flag values using atomic *_bit() operations */\n \tDECLARE_BITMAP(flags, __FM10K_FLAGS_SIZE__);\n@@ -367,22 +381,12 @@ struct fm10k_intfc {\n \tu16 vid;\n };\n \n-enum fm10k_state_t {\n-\t__FM10K_RESETTING,\n-\t__FM10K_DOWN,\n-\t__FM10K_SERVICE_SCHED,\n-\t__FM10K_SERVICE_DISABLE,\n-\t__FM10K_MBX_LOCK,\n-\t__FM10K_LINK_DOWN,\n-\t__FM10K_UPDATING_STATS,\n-};\n-\n static inline void fm10k_mbx_lock(struct fm10k_intfc *interface)\n {\n \t/* busy loop if we cannot obtain the lock as some calls\n \t * such as ndo_set_rx_mode may be made in atomic context\n \t */\n-\twhile (test_and_set_bit(__FM10K_MBX_LOCK, &interface->state))\n+\twhile (test_and_set_bit(__FM10K_MBX_LOCK, interface->state))\n \t\tudelay(20);\n }\n \n@@ -390,12 +394,12 @@ static inline void fm10k_mbx_unlock(struct fm10k_intfc *interface)\n {\n \t/* flush memory to make sure state is correct */\n \tsmp_mb__before_atomic();\n-\tclear_bit(__FM10K_MBX_LOCK, &interface->state);\n+\tclear_bit(__FM10K_MBX_LOCK, interface->state);\n }\n \n static inline int fm10k_mbx_trylock(struct fm10k_intfc *interface)\n {\n-\treturn !test_and_set_bit(__FM10K_MBX_LOCK, &interface->state);\n+\treturn !test_and_set_bit(__FM10K_MBX_LOCK, interface->state);\n }\n \n /* fm10k_test_staterr - test bits in Rx descriptor status and error fields */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 557966749174..dfa5c2a4efd8 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -562,7 +562,7 @@ static int fm10k_set_ringparam(struct net_device *netdev,\n \t\treturn 0;\n \t}\n \n-\twhile (test_and_set_bit(__FM10K_RESETTING, &interface->state))\n+\twhile (test_and_set_bit(__FM10K_RESETTING, interface->state))\n \t\tusleep_range(1000, 2000);\n \n \tif (!netif_running(interface->netdev)) {\n@@ -648,7 +648,7 @@ static int fm10k_set_ringparam(struct net_device *netdev,\n \tfm10k_up(interface);\n \tvfree(temp_ring);\n clear_reset:\n-\tclear_bit(__FM10K_RESETTING, &interface->state);\n+\tclear_bit(__FM10K_RESETTING, interface->state);\n \treturn err;\n }\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\nindex f9612a6b8524..9dffaba85ae6 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c\n@@ -1175,13 +1175,13 @@ bool fm10k_check_tx_hang(struct fm10k_ring *tx_ring)\n \t\t/* update completed stats and continue */\n \t\ttx_ring->tx_stats.tx_done_old = tx_done;\n \t\t/* reset the countdown */\n-\t\tclear_bit(__FM10K_HANG_CHECK_ARMED, &tx_ring->state);\n+\t\tclear_bit(__FM10K_HANG_CHECK_ARMED, tx_ring->state);\n \n \t\treturn false;\n \t}\n \n \t/* make sure it is true for two checks in a row */\n-\treturn test_and_set_bit(__FM10K_HANG_CHECK_ARMED, &tx_ring->state);\n+\treturn test_and_set_bit(__FM10K_HANG_CHECK_ARMED, tx_ring->state);\n }\n \n /**\n@@ -1191,7 +1191,7 @@ bool fm10k_check_tx_hang(struct fm10k_ring *tx_ring)\n void fm10k_tx_timeout_reset(struct fm10k_intfc *interface)\n {\n \t/* Do the reset outside of interrupt context */\n-\tif (!test_bit(__FM10K_DOWN, &interface->state)) {\n+\tif (!test_bit(__FM10K_DOWN, interface->state)) {\n \t\tinterface->tx_timeout_count++;\n \t\tset_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);\n \t\tfm10k_service_event_schedule(interface);\n@@ -1214,7 +1214,7 @@ static bool fm10k_clean_tx_irq(struct fm10k_q_vector *q_vector,\n \tunsigned int budget = q_vector->tx.work_limit;\n \tunsigned int i = tx_ring->next_to_clean;\n \n-\tif (test_bit(__FM10K_DOWN, &interface->state))\n+\tif (test_bit(__FM10K_DOWN, interface->state))\n \t\treturn true;\n \n \ttx_buffer = &tx_ring->tx_buffer[i];\n@@ -1344,7 +1344,7 @@ static bool fm10k_clean_tx_irq(struct fm10k_q_vector *q_vector,\n \t\tsmp_mb();\n \t\tif (__netif_subqueue_stopped(tx_ring->netdev,\n \t\t\t\t\t tx_ring->queue_index) &&\n-\t\t !test_bit(__FM10K_DOWN, &interface->state)) {\n+\t\t !test_bit(__FM10K_DOWN, interface->state)) {\n \t\t\tnetif_wake_subqueue(tx_ring->netdev,\n \t\t\t\t\t tx_ring->queue_index);\n \t\t\t++tx_ring->tx_stats.restart_queue;\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 0d220f1ab5d0..5e10296b1723 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -822,7 +822,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)\n \t/* Do not throw an error if the interface is down. We will sync once\n \t * we come up\n \t */\n-\tif (test_bit(__FM10K_DOWN, &interface->state))\n+\tif (test_bit(__FM10K_DOWN, interface->state))\n \t\treturn 0;\n \n \tfm10k_mbx_lock(interface);\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 8fe4f861e195..68a265ac09f4 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -92,18 +92,18 @@ static int fm10k_hw_ready(struct fm10k_intfc *interface)\n \n void fm10k_service_event_schedule(struct fm10k_intfc *interface)\n {\n-\tif (!test_bit(__FM10K_SERVICE_DISABLE, &interface->state) &&\n-\t !test_and_set_bit(__FM10K_SERVICE_SCHED, &interface->state))\n+\tif (!test_bit(__FM10K_SERVICE_DISABLE, interface->state) &&\n+\t !test_and_set_bit(__FM10K_SERVICE_SCHED, interface->state))\n \t\tqueue_work(fm10k_workqueue, &interface->service_task);\n }\n \n static void fm10k_service_event_complete(struct fm10k_intfc *interface)\n {\n-\tWARN_ON(!test_bit(__FM10K_SERVICE_SCHED, &interface->state));\n+\tWARN_ON(!test_bit(__FM10K_SERVICE_SCHED, interface->state));\n \n \t/* flush memory to make sure state is correct before next watchog */\n \tsmp_mb__before_atomic();\n-\tclear_bit(__FM10K_SERVICE_SCHED, &interface->state);\n+\tclear_bit(__FM10K_SERVICE_SCHED, interface->state);\n }\n \n /**\n@@ -158,7 +158,7 @@ static void fm10k_prepare_for_reset(struct fm10k_intfc *interface)\n \t/* put off any impending NetWatchDogTimeout */\n \tnetif_trans_update(netdev);\n \n-\twhile (test_and_set_bit(__FM10K_RESETTING, &interface->state))\n+\twhile (test_and_set_bit(__FM10K_RESETTING, interface->state))\n \t\tusleep_range(1000, 2000);\n \n \trtnl_lock();\n@@ -241,7 +241,7 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface)\n \n \trtnl_unlock();\n \n-\tclear_bit(__FM10K_RESETTING, &interface->state);\n+\tclear_bit(__FM10K_RESETTING, interface->state);\n \n \treturn err;\n err_open:\n@@ -253,7 +253,7 @@ static int fm10k_handle_reset(struct fm10k_intfc *interface)\n \n \trtnl_unlock();\n \n-\tclear_bit(__FM10K_RESETTING, &interface->state);\n+\tclear_bit(__FM10K_RESETTING, interface->state);\n \n \treturn err;\n }\n@@ -315,11 +315,11 @@ static void fm10k_watchdog_update_host_state(struct fm10k_intfc *interface)\n \tstruct fm10k_hw *hw = &interface->hw;\n \ts32 err;\n \n-\tif (test_bit(__FM10K_LINK_DOWN, &interface->state)) {\n+\tif (test_bit(__FM10K_LINK_DOWN, interface->state)) {\n \t\tinterface->host_ready = false;\n \t\tif (time_is_after_jiffies(interface->link_down_event))\n \t\t\treturn;\n-\t\tclear_bit(__FM10K_LINK_DOWN, &interface->state);\n+\t\tclear_bit(__FM10K_LINK_DOWN, interface->state);\n \t}\n \n \tif (test_bit(FM10K_FLAG_SWPRI_CONFIG, interface->flags)) {\n@@ -410,7 +410,7 @@ void fm10k_update_stats(struct fm10k_intfc *interface)\n \tint i;\n \n \t/* ensure only one thread updates stats at a time */\n-\tif (test_and_set_bit(__FM10K_UPDATING_STATS, &interface->state))\n+\tif (test_and_set_bit(__FM10K_UPDATING_STATS, interface->state))\n \t\treturn;\n \n \t/* do not allow stats update via service task for next second */\n@@ -491,7 +491,7 @@ void fm10k_update_stats(struct fm10k_intfc *interface)\n \tnet_stats->rx_errors = rx_errors;\n \tnet_stats->rx_dropped = interface->stats.nodesc_drop.count;\n \n-\tclear_bit(__FM10K_UPDATING_STATS, &interface->state);\n+\tclear_bit(__FM10K_UPDATING_STATS, interface->state);\n }\n \n /**\n@@ -531,8 +531,8 @@ static void fm10k_watchdog_flush_tx(struct fm10k_intfc *interface)\n static void fm10k_watchdog_subtask(struct fm10k_intfc *interface)\n {\n \t/* if interface is down do nothing */\n-\tif (test_bit(__FM10K_DOWN, &interface->state) ||\n-\t test_bit(__FM10K_RESETTING, &interface->state))\n+\tif (test_bit(__FM10K_DOWN, interface->state) ||\n+\t test_bit(__FM10K_RESETTING, interface->state))\n \t\treturn;\n \n \tif (interface->host_ready)\n@@ -562,8 +562,8 @@ static void fm10k_check_hang_subtask(struct fm10k_intfc *interface)\n \tint i;\n \n \t/* If we're down or resetting, just bail */\n-\tif (test_bit(__FM10K_DOWN, &interface->state) ||\n-\t test_bit(__FM10K_RESETTING, &interface->state))\n+\tif (test_bit(__FM10K_DOWN, interface->state) ||\n+\t test_bit(__FM10K_RESETTING, interface->state))\n \t\treturn;\n \n \t/* rate limit tx hang checks to only once every 2 seconds */\n@@ -662,7 +662,7 @@ static void fm10k_configure_tx_ring(struct fm10k_intfc *interface,\n \t\t\tFM10K_PFVTCTL_FTAG_DESC_ENABLE);\n \n \t/* Initialize XPS */\n-\tif (!test_and_set_bit(__FM10K_TX_XPS_INIT_DONE, &ring->state) &&\n+\tif (!test_and_set_bit(__FM10K_TX_XPS_INIT_DONE, ring->state) &&\n \t ring->q_vector)\n \t\tnetif_set_xps_queue(ring->netdev,\n \t\t\t\t &ring->q_vector->affinity_mask,\n@@ -979,7 +979,7 @@ void fm10k_netpoll(struct net_device *netdev)\n \tint i;\n \n \t/* if interface is down do nothing */\n-\tif (test_bit(__FM10K_DOWN, &interface->state))\n+\tif (test_bit(__FM10K_DOWN, interface->state))\n \t\treturn;\n \n \tfor (i = 0; i < interface->num_q_vectors; i++)\n@@ -1172,7 +1172,7 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data)\n \tif (eicr & FM10K_EICR_SWITCHNOTREADY) {\n \t\t/* force link down for at least 4 seconds */\n \t\tinterface->link_down_event = jiffies + (4 * HZ);\n-\t\tset_bit(__FM10K_LINK_DOWN, &interface->state);\n+\t\tset_bit(__FM10K_LINK_DOWN, interface->state);\n \n \t\t/* reset dglort_map back to no config */\n \t\thw->mac.dglort_map = FM10K_DGLORTMAP_NONE;\n@@ -1324,7 +1324,7 @@ static s32 fm10k_lport_map(struct fm10k_hw *hw, u32 **results,\n \tif (!err && hw->swapi.status) {\n \t\t/* force link down for a reasonable delay */\n \t\tinterface->link_down_event = jiffies + (2 * HZ);\n-\t\tset_bit(__FM10K_LINK_DOWN, &interface->state);\n+\t\tset_bit(__FM10K_LINK_DOWN, interface->state);\n \n \t\t/* reset dglort_map back to no config */\n \t\thw->mac.dglort_map = FM10K_DGLORTMAP_NONE;\n@@ -1622,10 +1622,10 @@ void fm10k_up(struct fm10k_intfc *interface)\n \thw->mac.ops.update_int_moderator(hw);\n \n \t/* enable statistics capture again */\n-\tclear_bit(__FM10K_UPDATING_STATS, &interface->state);\n+\tclear_bit(__FM10K_UPDATING_STATS, interface->state);\n \n \t/* clear down bit to indicate we are ready to go */\n-\tclear_bit(__FM10K_DOWN, &interface->state);\n+\tclear_bit(__FM10K_DOWN, interface->state);\n \n \t/* enable polling cleanups */\n \tfm10k_napi_enable_all(interface);\n@@ -1659,7 +1659,7 @@ void fm10k_down(struct fm10k_intfc *interface)\n \tint err, i = 0, count = 0;\n \n \t/* signal that we are down to the interrupt handler and service task */\n-\tif (test_and_set_bit(__FM10K_DOWN, &interface->state))\n+\tif (test_and_set_bit(__FM10K_DOWN, interface->state))\n \t\treturn;\n \n \t/* call carrier off first to avoid false dev_watchdog timeouts */\n@@ -1679,7 +1679,7 @@ void fm10k_down(struct fm10k_intfc *interface)\n \tfm10k_update_stats(interface);\n \n \t/* prevent updating statistics while we're down */\n-\twhile (test_and_set_bit(__FM10K_UPDATING_STATS, &interface->state))\n+\twhile (test_and_set_bit(__FM10K_UPDATING_STATS, interface->state))\n \t\tusleep_range(1000, 2000);\n \n \t/* skip waiting for TX DMA if we lost PCIe link */\n@@ -1848,8 +1848,8 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,\n \tmemcpy(interface->rssrk, rss_key, sizeof(rss_key));\n \n \t/* Start off interface as being down */\n-\tset_bit(__FM10K_DOWN, &interface->state);\n-\tset_bit(__FM10K_UPDATING_STATS, &interface->state);\n+\tset_bit(__FM10K_DOWN, interface->state);\n+\tset_bit(__FM10K_UPDATING_STATS, interface->state);\n \n \treturn 0;\n }\n@@ -2026,7 +2026,7 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t * must ensure it is disabled since we haven't yet requested the timer\n \t * or work item.\n \t */\n-\tset_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n+\tset_bit(__FM10K_SERVICE_DISABLE, interface->state);\n \n \terr = fm10k_mbx_request_irq(interface);\n \tif (err)\n@@ -2067,7 +2067,7 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tfm10k_iov_configure(pdev, 0);\n \n \t/* clear the service task disable bit to allow service task to start */\n-\tclear_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n+\tclear_bit(__FM10K_SERVICE_DISABLE, interface->state);\n \n \treturn 0;\n \n@@ -2105,7 +2105,7 @@ static void fm10k_remove(struct pci_dev *pdev)\n \n \tdel_timer_sync(&interface->service_timer);\n \n-\tset_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n+\tset_bit(__FM10K_SERVICE_DISABLE, interface->state);\n \tcancel_work_sync(&interface->service_task);\n \n \t/* free netdev, this may bounce the interrupts due to setup_tc */\n@@ -2144,7 +2144,7 @@ static void fm10k_prepare_suspend(struct fm10k_intfc *interface)\n \t * stopped. We stop the watchdog task until after we resume software\n \t * activity.\n \t */\n-\tset_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n+\tset_bit(__FM10K_SERVICE_DISABLE, interface->state);\n \tcancel_work_sync(&interface->service_task);\n \n \tfm10k_prepare_for_reset(interface);\n@@ -2170,10 +2170,10 @@ static int fm10k_handle_resume(struct fm10k_intfc *interface)\n \n \t/* force link to stay down for a second to prevent link flutter */\n \tinterface->link_down_event = jiffies + (HZ);\n-\tset_bit(__FM10K_LINK_DOWN, &interface->state);\n+\tset_bit(__FM10K_LINK_DOWN, interface->state);\n \n \t/* clear the service task disable bit to allow service task to start */\n-\tclear_bit(__FM10K_SERVICE_DISABLE, &interface->state);\n+\tclear_bit(__FM10K_SERVICE_DISABLE, interface->state);\n \tfm10k_service_event_schedule(interface);\n \n \treturn err;\n", "prefixes": [ "2/5" ] }