Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/524669/?format=api
{ "id": 524669, "url": "http://patchwork.ozlabs.org/api/patches/524669/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/560C5AFF.5080701@gmail.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": "<560C5AFF.5080701@gmail.com>", "list_archive_url": null, "date": "2015-09-30T21:58:23", "name": "e1000_main_c_Remove checkpatch coding style errors", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1f214342060b0452888795d0daa6a177836c2f68", "submitter": { "id": 67266, "url": "http://patchwork.ozlabs.org/api/people/67266/?format=api", "name": "Janusz Wolak", "email": "januszvdm@gmail.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/560C5AFF.5080701@gmail.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/524669/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/524669/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 11452140D69\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 1 Oct 2015 07:58:32 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2EC62952C6;\n\tWed, 30 Sep 2015 21:58:32 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ypLo0eS9Ckx9; Wed, 30 Sep 2015 21:58:30 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5A6159528A;\n\tWed, 30 Sep 2015 21:58:30 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id A8C751C0F20\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 Sep 2015 21:58:28 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A16F9A4A51\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 Sep 2015 21:58:28 +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 ExfCLCfMp1tO for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 Sep 2015 21:58:27 +0000 (UTC)", "from mail-la0-f48.google.com (mail-la0-f48.google.com\n\t[209.85.215.48])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 41941A4A46\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 Sep 2015 21:58:27 +0000 (UTC)", "by laer8 with SMTP id r8so62550559lae.2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 30 Sep 2015 14:58:25 -0700 (PDT)", "from [192.168.0.100] (106-153-255-130.dynamic.t-mont.net.pl.\n\t[130.255.153.106]) by smtp.gmail.com with ESMTPSA id\n\tf9sm287714laa.35.2015.09.30.14.58.23\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 30 Sep 2015 14:58:24 -0700 (PDT)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com header.b=LA6uJHpe;\n\tdkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\n\th=to:from:subject:message-id:date:user-agent:mime-version\n\t:content-type; bh=4a8xbzE7nRNM24/bOhX3fzKA5AV7Alt751P7FjirO1A=;\n\tb=LA6uJHpeViXlt6F6HoX8zeB38buxJgPFOCQ8d/U8ho2BGxVVh0bebBr2CHOU3bYpCj\n\tEbTzO0OLm0p9bSkzeckqR7pDny2kbOoPE1EWU7HNZ4g1OCC0skv+CKoUWnVsJ9kH0NQe\n\tMkCGswZDcYa09hSFMjuf+Q1p+1vz4IBvOTqGnq8LOUrQWuRFEP4esrmF7vFN5WCtX5EV\n\tjstcymRsEag3dtcUkNjG5qh//ySUrZi4EAbpJIADQ2wtcgdkwFUniYVpppb+AHBXbUhZ\n\tOqdzgXKjJKkDFHyRWU/Bsx9A4xTPXprySzeVILMlW7vO6sYHt5CjvERHod+FHKF1dwtL\n\tIg4Q==", "X-Received": "by 10.25.17.149 with SMTP id 21mr1194856lfr.38.1443650305306;\n\tWed, 30 Sep 2015 14:58:25 -0700 (PDT)", "To": "john.ronciak@intel.com, mitch.a.williams@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "From": "Janusz Wolak <januszvdm@gmail.com>", "Message-ID": "<560C5AFF.5080701@gmail.com>", "Date": "Wed, 30 Sep 2015 23:58:23 +0200", "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101\n\tThunderbird/38.2.0", "MIME-Version": "1.0", "Content-Type": "multipart/mixed;\n\tboundary=\"------------000607020507080304020701\"", "Subject": "[Intel-wired-lan] e1000_main_c_Remove checkpatch coding style errors", "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>", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "", "diff": "From 3ff533dfb7644ebf0e13f225fe7682f52b5c862d Mon Sep 17 00:00:00 2001\nFrom: Janusz Wolak <januszvdm@gmail.com>\nDate: Wed, 30 Sep 2015 23:44:13 +0200\nSubject: [PATCH] Remove checkpatch coding style errors.\n\nSigned-off-by: Janusz Wolak <januszvdm@gmail.com>\n---\n drivers/net/ethernet/intel/e1000/e1000_main.c | 116 +++++++++++++++-----------\n 1 file changed, 65 insertions(+), 51 deletions(-)\n\ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c\nindex 74dc150..e0c3c14 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_main.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n@@ -99,13 +99,13 @@ int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);\n void e1000_free_all_tx_resources(struct e1000_adapter *adapter);\n void e1000_free_all_rx_resources(struct e1000_adapter *adapter);\n static int e1000_setup_tx_resources(struct e1000_adapter *adapter,\n- struct e1000_tx_ring *txdr);\n+\t\t\t\t struct e1000_tx_ring *txdr);\n static int e1000_setup_rx_resources(struct e1000_adapter *adapter,\n- struct e1000_rx_ring *rxdr);\n+\t\t\t\t struct e1000_rx_ring *rxdr);\n static void e1000_free_tx_resources(struct e1000_adapter *adapter,\n- struct e1000_tx_ring *tx_ring);\n+\t\t\t\t struct e1000_tx_ring *tx_ring);\n static void e1000_free_rx_resources(struct e1000_adapter *adapter,\n- struct e1000_rx_ring *rx_ring);\n+\t\t\t\t struct e1000_rx_ring *rx_ring);\n void e1000_update_stats(struct e1000_adapter *adapter);\n \n static int e1000_init_module(void);\n@@ -122,16 +122,16 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter);\n static void e1000_clean_all_tx_rings(struct e1000_adapter *adapter);\n static void e1000_clean_all_rx_rings(struct e1000_adapter *adapter);\n static void e1000_clean_tx_ring(struct e1000_adapter *adapter,\n- struct e1000_tx_ring *tx_ring);\n+\t\t\t\tstruct e1000_tx_ring *tx_ring);\n static void e1000_clean_rx_ring(struct e1000_adapter *adapter,\n- struct e1000_rx_ring *rx_ring);\n+\t\t\t\tstruct e1000_rx_ring *rx_ring);\n static void e1000_set_rx_mode(struct net_device *netdev);\n static void e1000_update_phy_info_task(struct work_struct *work);\n static void e1000_watchdog(struct work_struct *work);\n static void e1000_82547_tx_fifo_stall_task(struct work_struct *work);\n static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,\n \t\t\t\t struct net_device *netdev);\n-static struct net_device_stats * e1000_get_stats(struct net_device *netdev);\n+static struct net_device_stats *e1000_get_stats(struct net_device *netdev);\n static int e1000_change_mtu(struct net_device *netdev, int new_mtu);\n static int e1000_set_mac(struct net_device *netdev, void *p);\n static irqreturn_t e1000_intr(int irq, void *data);\n@@ -164,7 +164,7 @@ static void e1000_tx_timeout(struct net_device *dev);\n static void e1000_reset_task(struct work_struct *work);\n static void e1000_smartspeed(struct e1000_adapter *adapter);\n static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,\n- struct sk_buff *skb);\n+\t\t\t\t struct sk_buff *skb);\n \n static bool e1000_vlan_used(struct e1000_adapter *adapter);\n static void e1000_vlan_mode(struct net_device *netdev,\n@@ -195,7 +195,7 @@ MODULE_PARM_DESC(copybreak,\n \t\"Maximum size of packet that is copied to a new buffer on receive\");\n \n static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev,\n- pci_channel_state_t state);\n+\t\t\t\t\t\tpci_channel_state_t state);\n static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev);\n static void e1000_io_resume(struct pci_dev *pdev);\n \n@@ -287,7 +287,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)\n \tint err;\n \n \terr = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,\n-\t netdev);\n+\t\t\t netdev);\n \tif (err) {\n \t\te_err(probe, \"Unable to allocate interrupt Error: %d\\n\", err);\n \t}\n@@ -636,8 +636,8 @@ void e1000_reset(struct e1000_adapter *adapter)\n \t\t * but don't include ethernet FCS because hardware appends it\n \t\t */\n \t\tmin_tx_space = (hw->max_frame_size +\n-\t\t sizeof(struct e1000_tx_desc) -\n-\t\t ETH_FCS_LEN) * 2;\n+\t\t\t\tsizeof(struct e1000_tx_desc) -\n+\t\t\t\tETH_FCS_LEN) * 2;\n \t\tmin_tx_space = ALIGN(min_tx_space, 1024);\n \t\tmin_tx_space >>= 10;\n \t\t/* software strips receive CRC, so leave room for it */\n@@ -943,8 +943,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tstruct e1000_adapter *adapter;\n \tstruct e1000_hw *hw;\n \n-\tstatic int cards_found = 0;\n-\tstatic int global_quad_port_a = 0; /* global ksp3 port a indication */\n+\tstatic int cards_found;\n+\tstatic int global_quad_port_a; /* global ksp3 port a indication */\n \tint i, err, pci_using_dac;\n \tu16 eeprom_data = 0;\n \tu16 tmp = 0;\n@@ -1046,7 +1046,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tif (hw->mac_type == e1000_ce4100) {\n \t\thw->ce4100_gbe_mdio_base_virt =\n \t\t\t\t\tioremap(pci_resource_start(pdev, BAR_1),\n-\t\t pci_resource_len(pdev, BAR_1));\n+\t\t\t\t\t\tpci_resource_len(pdev, BAR_1));\n \n \t\tif (!hw->ce4100_gbe_mdio_base_virt)\n \t\t\tgoto err_mdio_ioremap;\n@@ -1148,7 +1148,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t\tbreak;\n \tcase e1000_82546:\n \tcase e1000_82546_rev_3:\n-\t\tif (er32(STATUS) & E1000_STATUS_FUNC_1){\n+\t\tif (er32(STATUS) & E1000_STATUS_FUNC_1) {\n \t\t\te1000_read_eeprom(hw,\n \t\t\t\tEEPROM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);\n \t\t\tbreak;\n@@ -1334,12 +1334,12 @@ static int e1000_sw_init(struct e1000_adapter *adapter)\n static int e1000_alloc_queues(struct e1000_adapter *adapter)\n {\n \tadapter->tx_ring = kcalloc(adapter->num_tx_queues,\n-\t sizeof(struct e1000_tx_ring), GFP_KERNEL);\n+\t\t\t\t sizeof(struct e1000_tx_ring), GFP_KERNEL);\n \tif (!adapter->tx_ring)\n \t\treturn -ENOMEM;\n \n \tadapter->rx_ring = kcalloc(adapter->num_rx_queues,\n-\t sizeof(struct e1000_rx_ring), GFP_KERNEL);\n+\t\t\t\t sizeof(struct e1000_rx_ring), GFP_KERNEL);\n \tif (!adapter->rx_ring) {\n \t\tkfree(adapter->tx_ring);\n \t\treturn -ENOMEM;\n@@ -1811,20 +1811,20 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)\n \trctl &= ~E1000_RCTL_SZ_4096;\n \trctl |= E1000_RCTL_BSEX;\n \tswitch (adapter->rx_buffer_len) {\n-\t\tcase E1000_RXBUFFER_2048:\n-\t\tdefault:\n-\t\t\trctl |= E1000_RCTL_SZ_2048;\n-\t\t\trctl &= ~E1000_RCTL_BSEX;\n-\t\t\tbreak;\n-\t\tcase E1000_RXBUFFER_4096:\n-\t\t\trctl |= E1000_RCTL_SZ_4096;\n-\t\t\tbreak;\n-\t\tcase E1000_RXBUFFER_8192:\n-\t\t\trctl |= E1000_RCTL_SZ_8192;\n-\t\t\tbreak;\n-\t\tcase E1000_RXBUFFER_16384:\n-\t\t\trctl |= E1000_RCTL_SZ_16384;\n-\t\t\tbreak;\n+\tcase E1000_RXBUFFER_2048:\n+\tdefault:\n+\t\trctl |= E1000_RCTL_SZ_2048;\n+\t\trctl &= ~E1000_RCTL_BSEX;\n+\t\tbreak;\n+\tcase E1000_RXBUFFER_4096:\n+\t\trctl |= E1000_RCTL_SZ_4096;\n+\t\tbreak;\n+\tcase E1000_RXBUFFER_8192:\n+\t\trctl |= E1000_RCTL_SZ_8192;\n+\t\tbreak;\n+\tcase E1000_RXBUFFER_16384:\n+\t\trctl |= E1000_RCTL_SZ_16384;\n+\t\tbreak;\n \t}\n \n \t/* This is useful for sniffing bad packets. */\n@@ -1861,12 +1861,12 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)\n \n \tif (adapter->netdev->mtu > ETH_DATA_LEN) {\n \t\trdlen = adapter->rx_ring[0].count *\n-\t\t sizeof(struct e1000_rx_desc);\n+\t\t\tsizeof(struct e1000_rx_desc);\n \t\tadapter->clean_rx = e1000_clean_jumbo_rx_irq;\n \t\tadapter->alloc_rx_buf = e1000_alloc_jumbo_rx_buffers;\n \t} else {\n \t\trdlen = adapter->rx_ring[0].count *\n-\t\t sizeof(struct e1000_rx_desc);\n+\t\t\tsizeof(struct e1000_rx_desc);\n \t\tadapter->clean_rx = e1000_clean_rx_irq;\n \t\tadapter->alloc_rx_buf = e1000_alloc_rx_buffers;\n \t}\n@@ -2761,7 +2761,9 @@ static int e1000_tso(struct e1000_adapter *adapter,\n \t\tbuffer_info->time_stamp = jiffies;\n \t\tbuffer_info->next_to_watch = i;\n \n-\t\tif (++i == tx_ring->count) i = 0;\n+\t\tif (++i == tx_ring->count)\n+\t\t\ti = 0;\n+\n \t\ttx_ring->next_to_use = i;\n \n \t\treturn true;\n@@ -2816,7 +2818,9 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter,\n \tbuffer_info->time_stamp = jiffies;\n \tbuffer_info->next_to_watch = i;\n \n-\tif (unlikely(++i == tx_ring->count)) i = 0;\n+\tif (unlikely(++i == tx_ring->count))\n+\t\ti = 0;\n+\n \ttx_ring->next_to_use = i;\n \n \treturn true;\n@@ -2865,8 +2869,8 @@ static int e1000_tx_map(struct e1000_adapter *adapter,\n \t\t * packet is smaller than 2048 - 16 - 16 (or 2016) bytes\n \t\t */\n \t\tif (unlikely((hw->bus_type == e1000_bus_type_pcix) &&\n-\t\t (size > 2015) && count == 0))\n-\t\t size = 2015;\n+\t\t\t (size > 2015) && count == 0))\n+\t\t\tsize = 2015;\n \n \t\t/* Workaround for potential 82544 hang in PCI-X. Avoid\n \t\t * terminating buffers within evenly-aligned dwords.\n@@ -2963,7 +2967,7 @@ dma_error:\n \t\tcount--;\n \n \twhile (count--) {\n-\t\tif (i==0)\n+\t\tif (i == 0)\n \t\t\ti += tx_ring->count;\n \t\ti--;\n \t\tbuffer_info = &tx_ring->buffer_info[i];\n@@ -3013,7 +3017,8 @@ static void e1000_tx_queue(struct e1000_adapter *adapter,\n \t\ttx_desc->lower.data =\n \t\t\tcpu_to_le32(txd_lower | buffer_info->length);\n \t\ttx_desc->upper.data = cpu_to_le32(txd_upper);\n-\t\tif (unlikely(++i == tx_ring->count)) i = 0;\n+\t\tif (unlikely(++i == tx_ring->count))\n+\t\t\ti = 0;\n \t}\n \n \ttx_desc->lower.data |= cpu_to_le32(adapter->txd_cmd);\n@@ -3101,7 +3106,7 @@ static int e1000_maybe_stop_tx(struct net_device *netdev,\n \treturn __e1000_maybe_stop_tx(netdev, size);\n }\n \n-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )\n+#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1)\n static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,\n \t\t\t\t struct net_device *netdev)\n {\n@@ -3841,7 +3846,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,\n \tstruct e1000_tx_buffer *buffer_info;\n \tunsigned int i, eop;\n \tunsigned int count = 0;\n-\tunsigned int total_tx_bytes=0, total_tx_packets=0;\n+\tunsigned int total_tx_bytes = 0, total_tx_packets = 0;\n \tunsigned int bytes_compl = 0, pkts_compl = 0;\n \n \ti = tx_ring->next_to_clean;\n@@ -3869,7 +3874,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,\n \t\t\te1000_unmap_and_free_tx_resource(adapter, buffer_info);\n \t\t\ttx_desc->upper.data = 0;\n \n-\t\t\tif (unlikely(++i == tx_ring->count)) i = 0;\n+\t\t\tif (unlikely(++i == tx_ring->count))\n+\t\t\t\ti = 0;\n \t\t}\n \n \t\teop = tx_ring->buffer_info[i].next_to_watch;\n@@ -3954,9 +3960,11 @@ static void e1000_rx_checksum(struct e1000_adapter *adapter, u32 status_err,\n \tskb_checksum_none_assert(skb);\n \n \t/* 82543 or newer only */\n-\tif (unlikely(hw->mac_type < e1000_82543)) return;\n+\tif (unlikely(hw->mac_type < e1000_82543))\n+\t\treturn;\n \t/* Ignore Checksum bit is set */\n-\tif (unlikely(status & E1000_RXD_STAT_IXSM)) return;\n+\tif (unlikely(status & E1000_RXD_STAT_IXSM))\n+\t\treturn;\n \t/* TCP/UDP checksum error bit is set */\n \tif (unlikely(errors & E1000_RXD_ERR_TCPE)) {\n \t\t/* let the stack verify checksum errors */\n@@ -4136,7 +4144,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,\n \tunsigned int i;\n \tint cleaned_count = 0;\n \tbool cleaned = false;\n-\tunsigned int total_rx_bytes=0, total_rx_packets=0;\n+\tunsigned int total_rx_bytes = 0, total_rx_packets = 0;\n \n \ti = rx_ring->next_to_clean;\n \trx_desc = E1000_RX_DESC(*rx_ring, i);\n@@ -4153,7 +4161,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,\n \n \t\tstatus = rx_desc->status;\n \n-\t\tif (++i == rx_ring->count) i = 0;\n+\t\tif (++i == rx_ring->count)\n+\t\t\ti = 0;\n+\n \t\tnext_rxd = E1000_RX_DESC(*rx_ring, i);\n \t\tprefetch(next_rxd);\n \n@@ -4356,7 +4366,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,\n \tunsigned int i;\n \tint cleaned_count = 0;\n \tbool cleaned = false;\n-\tunsigned int total_rx_bytes=0, total_rx_packets=0;\n+\tunsigned int total_rx_bytes = 0, total_rx_packets = 0;\n \n \ti = rx_ring->next_to_clean;\n \trx_desc = E1000_RX_DESC(*rx_ring, i);\n@@ -4395,7 +4405,9 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,\n \t\t\tbuffer_info->rxbuf.data = NULL;\n \t\t}\n \n-\t\tif (++i == rx_ring->count) i = 0;\n+\t\tif (++i == rx_ring->count)\n+\t\t\ti = 0;\n+\n \t\tnext_rxd = E1000_RX_DESC(*rx_ring, i);\n \t\tprefetch(next_rxd);\n \n@@ -4683,9 +4695,11 @@ static void e1000_smartspeed(struct e1000_adapter *adapter)\n \t\t * we assume back-to-back\n \t\t */\n \t\te1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);\n-\t\tif (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;\n+\t\tif (!(phy_status & SR_1000T_MS_CONFIG_FAULT))\n+\t\t\treturn;\n \t\te1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_status);\n-\t\tif (!(phy_status & SR_1000T_MS_CONFIG_FAULT)) return;\n+\t\tif (!(phy_status & SR_1000T_MS_CONFIG_FAULT))\n+\t\t\treturn;\n \t\te1000_read_phy_reg(hw, PHY_1000T_CTRL, &phy_ctrl);\n \t\tif (phy_ctrl & CR_1000T_MS_ENABLE) {\n \t\t\tphy_ctrl &= ~CR_1000T_MS_ENABLE;\n-- \n1.9.1\n\n", "prefixes": [] }