Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/822113/?format=api
{ "id": 822113, "url": "http://patchwork.ozlabs.org/api/patches/822113/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171005215344.2886-8-alan.brady@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": "<20171005215344.2886-8-alan.brady@intel.com>", "list_archive_url": null, "date": "2017-10-05T21:53:37", "name": "[v3,07/14,net-next] i40e: fix whitespace issues in i40e_ethtool.c", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "95781819491cff11d58cf23436a443c225fa4f5b", "submitter": { "id": 69551, "url": "http://patchwork.ozlabs.org/api/people/69551/?format=api", "name": "Alan Brady", "email": "alan.brady@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/20171005215344.2886-8-alan.brady@intel.com/mbox/", "series": [ { "id": 6727, "url": "http://patchwork.ozlabs.org/api/series/6727/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=6727", "date": "2017-10-05T21:53:35", "name": "i40e: refactor ethtool interface", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/6727/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/822113/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/822113/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.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 3y7RSq6gdvz9t6D\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 6 Oct 2017 08:57:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 49AD582899;\n\tThu, 5 Oct 2017 21:57:14 +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 mTddDgI+Rs8B; Thu, 5 Oct 2017 21:57:11 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 83D0488D6B;\n\tThu, 5 Oct 2017 21:57:11 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id E1BFE1C097A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:05 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D9D358817A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:05 +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 5TzptfN4Ui62 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:05 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 1F4AB8817B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 5 Oct 2017 21:57:05 +0000 (UTC)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Oct 2017 14:56:41 -0700", "from dev1-atbrady.jf.intel.com ([10.165.248.38])\n\tby fmsmga005.fm.intel.com with ESMTP; 05 Oct 2017 14:56:41 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.42,482,1500966000\"; d=\"scan'208\";a=\"159384216\"", "From": "Alan Brady <alan.brady@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 5 Oct 2017 14:53:37 -0700", "Message-Id": "<20171005215344.2886-8-alan.brady@intel.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20171005215344.2886-1-alan.brady@intel.com>", "References": "<20171005215344.2886-1-alan.brady@intel.com>", "Subject": "[Intel-wired-lan] [PATCH v3 07/14 net-next] i40e: fix whitespace\n\tissues in i40e_ethtool.c", "X-BeenThere": "intel-wired-lan@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.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>", "MIME-Version": "1.0", "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": "There's a number of minor incidental whitespace issues in this file.\nThis addresses most of the ones I could find.\n\nSigned-off-by: Alan Brady <alan.brady@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 46 +++++++++++---------------\n 1 file changed, 19 insertions(+), 27 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex a6143b9d86db..6296bb2e8bd3 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -511,7 +511,8 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,\n \t\tbreak;\n \tdefault:\n \t\t/* if we got here and link is up something bad is afoot */\n-\t\tnetdev_info(netdev, \"WARNING: Link is up but PHY type 0x%x is not recognized.\\n\",\n+\t\tnetdev_info(netdev,\n+\t\t\t \"WARNING: Link is up but PHY type 0x%x is not recognized.\\n\",\n \t\t\t hw_link_info->phy_type);\n \t}\n \n@@ -614,14 +615,12 @@ static int i40e_get_link_ksettings(struct net_device *netdev,\n \tks->base.autoneg = ((hw_link_info->an_info & I40E_AQ_AN_COMPLETED) ?\n \t\t\t AUTONEG_ENABLE : AUTONEG_DISABLE);\n \n+\t/* Set media type settings */\n \tswitch (hw->phy.media_type) {\n \tcase I40E_MEDIA_TYPE_BACKPLANE:\n-\t\tethtool_link_ksettings_add_link_mode(ks, supported,\n-\t\t\t\t\t\t Autoneg);\n-\t\tethtool_link_ksettings_add_link_mode(ks, supported,\n-\t\t\t\t\t\t Backplane);\n-\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n-\t\t\t\t\t\t Autoneg);\n+\t\tethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);\n+\t\tethtool_link_ksettings_add_link_mode(ks, supported, Backplane);\n+\t\tethtool_link_ksettings_add_link_mode(ks, advertising, Autoneg);\n \t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t Backplane);\n \t\tks->base.port = PORT_NONE;\n@@ -652,16 +651,14 @@ static int i40e_get_link_ksettings(struct net_device *netdev,\n \n \tswitch (hw->fc.requested_mode) {\n \tcase I40E_FC_FULL:\n-\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n-\t\t\t\t\t\t Pause);\n+\t\tethtool_link_ksettings_add_link_mode(ks, advertising, Pause);\n \t\tbreak;\n \tcase I40E_FC_TX_PAUSE:\n \t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t Asym_Pause);\n \t\tbreak;\n \tcase I40E_FC_RX_PAUSE:\n-\t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n-\t\t\t\t\t\t Pause);\n+\t\tethtool_link_ksettings_add_link_mode(ks, advertising, Pause);\n \t\tethtool_link_ksettings_add_link_mode(ks, advertising,\n \t\t\t\t\t\t Asym_Pause);\n \t\tbreak;\n@@ -708,17 +705,14 @@ static int i40e_set_link_ksettings(struct net_device *netdev,\n \t\ti40e_partition_setting_complaint(pf);\n \t\treturn -EOPNOTSUPP;\n \t}\n-\n \tif (vsi != pf->vsi[pf->lan_vsi])\n \t\treturn -EOPNOTSUPP;\n-\n \tif (hw->phy.media_type != I40E_MEDIA_TYPE_BASET &&\n \t hw->phy.media_type != I40E_MEDIA_TYPE_FIBER &&\n \t hw->phy.media_type != I40E_MEDIA_TYPE_BACKPLANE &&\n \t hw->phy.media_type != I40E_MEDIA_TYPE_DA &&\n \t hw->phy.link_info.link_info & I40E_AQ_LINK_UP)\n \t\treturn -EOPNOTSUPP;\n-\n \tif (hw->device_id == I40E_DEV_ID_KX_B ||\n \t hw->device_id == I40E_DEV_ID_KX_C ||\n \t hw->device_id == I40E_DEV_ID_20G_KR2 ||\n@@ -781,7 +775,7 @@ static int i40e_set_link_ksettings(struct net_device *netdev,\n \t\tif (!(hw->phy.link_info.an_info & I40E_AQ_AN_COMPLETED)) {\n \t\t\t/* If autoneg is not supported, return error */\n \t\t\tif (!ethtool_link_ksettings_test_link_mode(\n-\t\t\t\t &safe_ks, supported, Autoneg)) {\n+\t\t\t\t &safe_ks, supported, Autoneg)) {\n \t\t\t\tnetdev_info(netdev, \"Autoneg not supported on this phy\\n\");\n \t\t\t\terr = -EINVAL;\n \t\t\t\tgoto done;\n@@ -842,7 +836,6 @@ static int i40e_set_link_ksettings(struct net_device *netdev,\n \t */\n \tif (!config.link_speed)\n \t\tconfig.link_speed = abilities.link_speed;\n-\n \tif (change || (abilities.link_speed != config.link_speed)) {\n \t\t/* copy over the rest of the abilities */\n \t\tconfig.phy_type = abilities.phy_type;\n@@ -870,7 +863,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev,\n \t\t/* make the aq call */\n \t\tstatus = i40e_aq_set_phy_config(hw, &config, NULL);\n \t\tif (status) {\n-\t\t\tnetdev_info(netdev, \"Set phy config failed, err %s aq_err %s\\n\",\n+\t\t\tnetdev_info(netdev,\n+\t\t\t\t \"Set phy config failed, err %s aq_err %s\\n\",\n \t\t\t\t i40e_stat_str(hw, status),\n \t\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n \t\t\terr = -EAGAIN;\n@@ -879,7 +873,8 @@ static int i40e_set_link_ksettings(struct net_device *netdev,\n \n \t\tstatus = i40e_update_link_info(hw);\n \t\tif (status)\n-\t\t\tnetdev_dbg(netdev, \"Updating link info failed with err %s aq_err %s\\n\",\n+\t\t\tnetdev_dbg(netdev,\n+\t\t\t\t \"Updating link info failed with err %s aq_err %s\\n\",\n \t\t\t\t i40e_stat_str(hw, status),\n \t\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n \n@@ -2070,14 +2065,13 @@ static int __i40e_get_coalesce(struct net_device *netdev,\n \tec->tx_max_coalesced_frames_irq = vsi->work_limit;\n \tec->rx_max_coalesced_frames_irq = vsi->work_limit;\n \n-\t/* rx and tx usecs has per queue value. If user doesn't specify the queue,\n-\t * return queue 0's value to represent.\n+\t/* rx and tx usecs has per queue value. If user doesn't specify the\n+\t * queue, return queue 0's value to represent.\n \t */\n-\tif (queue < 0) {\n+\tif (queue < 0)\n \t\tqueue = 0;\n-\t} else if (queue >= vsi->num_queue_pairs) {\n+\telse if (queue >= vsi->num_queue_pairs)\n \t\treturn -EINVAL;\n-\t}\n \n \trx_ring = vsi->rx_rings[queue];\n \ttx_ring = vsi->tx_rings[queue];\n@@ -2091,7 +2085,6 @@ static int __i40e_get_coalesce(struct net_device *netdev,\n \tec->rx_coalesce_usecs = rx_ring->rx_itr_setting & ~I40E_ITR_DYNAMIC;\n \tec->tx_coalesce_usecs = tx_ring->tx_itr_setting & ~I40E_ITR_DYNAMIC;\n \n-\n \t/* we use the _usecs_high to store/set the interrupt rate limit\n \t * that the hardware supports, that almost but not quite\n \t * fits the original intent of the ethtool variable,\n@@ -2141,7 +2134,6 @@ static int i40e_get_per_queue_coalesce(struct net_device *netdev, u32 queue,\n *\n * Change the ITR settings for a specific queue.\n **/\n-\n static void i40e_set_itr_per_queue(struct i40e_vsi *vsi,\n \t\t\t\t struct ethtool_coalesce *ec,\n \t\t\t\t int queue)\n@@ -2263,8 +2255,8 @@ static int __i40e_set_coalesce(struct net_device *netdev,\n \t\t\t vsi->int_rate_limit);\n \t}\n \n-\t/* rx and tx usecs has per queue value. If user doesn't specify the queue,\n-\t * apply to all queues.\n+\t/* rx and tx usecs has per queue value. If user doesn't specify the\n+\t * queue, apply to all queues.\n \t */\n \tif (queue < 0) {\n \t\tfor (i = 0; i < vsi->num_queue_pairs; i++)\n", "prefixes": [ "v3", "07/14", "net-next" ] }