Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/537615/?format=api
{ "id": 537615, "url": "http://patchwork.ozlabs.org/api/patches/537615/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20151029001956.19165.81543.stgit@bwallan-cwp1.jf.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": "<20151029001956.19165.81543.stgit@bwallan-cwp1.jf.intel.com>", "list_archive_url": null, "date": "2015-10-29T00:19:56", "name": "[next-queue,v2] fm10k: cleanup overly long lines", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "44d4d8d6925d586eae3a4ad9b16cb4e5b89831b3", "submitter": { "id": 503, "url": "http://patchwork.ozlabs.org/api/people/503/?format=api", "name": "Allan, Bruce W", "email": "bruce.w.allan@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/20151029001956.19165.81543.stgit@bwallan-cwp1.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/537615/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/537615/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\tby ozlabs.org (Postfix) with ESMTP id 0A1D71402D4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 29 Oct 2015 11:20:21 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3EA418B210;\n\tThu, 29 Oct 2015 00:20:20 +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 gUI5mUTJMNGZ; Thu, 29 Oct 2015 00:20:19 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A66AF89628;\n\tThu, 29 Oct 2015 00:20:19 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 68E0F1C44C4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Oct 2015 00:20:18 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 64CC589E39\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Oct 2015 00:20:18 +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 PjJKBne5Yqq8 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Oct 2015 00:20:17 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id A225289628\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 29 Oct 2015 00:20:17 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga101.fm.intel.com with ESMTP; 28 Oct 2015 17:19:57 -0700", "from bwallan-cwp1.jf.intel.com (HELO bwallan-cwp1)\n\t([10.166.140.23])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Oct 2015 17:19:56 -0700", "from bwallan-cwp1.jf.intel.com (localhost [127.0.0.1])\n\tby bwallan-cwp1 (8.15.2/8.15.1) with ESMTP id t9T0JuIS019231\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 28 Oct 2015 17:19:56 -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.20,212,1444719600\"; d=\"scan'208\";a=\"589971752\"", "From": "Bruce Allan <bruce.w.allan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 28 Oct 2015 17:19:56 -0700", "Message-ID": "<20151029001956.19165.81543.stgit@bwallan-cwp1.jf.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next-queue PATCH v2] fm10k: cleanup overly long\n\tlines", "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>", "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": "Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 12 ++++++---\n drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 ++-\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 29 ++++++++++++----------\n drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 7 +++--\n 6 files changed, 33 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 6735f7d..b34bb00 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -166,7 +166,7 @@ struct fm10k_ring_container {\n \tunsigned int total_packets;\t/* total packets processed this int */\n \tu16 work_limit;\t\t\t/* total work allowed per interrupt */\n \tu16 itr;\t\t\t/* interrupt throttle rate value */\n-\tu8 itr_scale;\t\t\t/* ITR adjustment scaler based on PCI speed */\n+\tu8 itr_scale;\t\t\t/* ITR adjustment based on PCI speed */\n \tu8 count;\t\t\t/* total number of rings in vector */\n };\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\nindex 3b857f4..2f6a05b 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c\n@@ -259,7 +259,8 @@ static int fm10k_get_sset_count(struct net_device *dev, int sset)\n \t\t\tstats_len += FM10K_DEBUG_STATS_LEN;\n \n \t\t\tif (iov_data)\n-\t\t\t\tstats_len += FM10K_MBX_STATS_LEN * iov_data->num_vfs;\n+\t\t\t\tstats_len += FM10K_MBX_STATS_LEN *\n+\t\t\t\t\tiov_data->num_vfs;\n \t\t}\n \n \t\treturn stats_len;\n@@ -298,14 +299,16 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \n \tif (interface->flags & FM10K_FLAG_DEBUG_STATS) {\n \t\tfor (i = 0; i < FM10K_DEBUG_STATS_LEN; i++) {\n-\t\t\tp = (char *)interface + fm10k_gstrings_debug_stats[i].stat_offset;\n+\t\t\tp = (char *)interface +\n+\t\t\t\tfm10k_gstrings_debug_stats[i].stat_offset;\n \t\t\t*(data++) = (fm10k_gstrings_debug_stats[i].sizeof_stat ==\n \t\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n \t\t}\n \t}\n \n \tfor (i = 0; i < FM10K_MBX_STATS_LEN; i++) {\n-\t\tp = (char *)&interface->hw.mbx + fm10k_gstrings_mbx_stats[i].stat_offset;\n+\t\tp = (char *)&interface->hw.mbx +\n+\t\t\tfm10k_gstrings_mbx_stats[i].stat_offset;\n \t\t*(data++) = (fm10k_gstrings_mbx_stats[i].sizeof_stat ==\n \t\t\tsizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n \t}\n@@ -332,7 +335,8 @@ static void fm10k_get_ethtool_stats(struct net_device *netdev,\n \t\t\t}\n \n \t\t\tfor (j = 0; j < FM10K_MBX_STATS_LEN; j++) {\n-\t\t\t\tp = (char *)&vf_info->mbx + fm10k_gstrings_mbx_stats[j].stat_offset;\n+\t\t\t\tp = (char *)&vf_info->mbx +\n+\t\t\t\t\tfm10k_gstrings_mbx_stats[j].stat_offset;\n \t\t\t\t*(data++) = (fm10k_gstrings_mbx_stats[j].sizeof_stat ==\n \t\t\t\t\t sizeof(u64)) ? *(u64 *)p : *(u32 *)p;\n \t\t\t}\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c\nindex b31bbc2..c7fea47 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_mbx.c\n@@ -903,7 +903,7 @@ static void fm10k_mbx_create_disconnect_hdr(struct fm10k_mbx_info *mbx)\n }\n \n /**\n- * fm10k_mbx_create_fake_disconnect_hdr - Generate a false disconnect mailbox header\n+ * fm10k_mbx_create_fake_disconnect_hdr - Generate a false disconnect mbox hdr\n * @mbx: pointer to mailbox\n *\n * This function creates a fake disconnect header for loading into remote\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 56b402b..722ac52 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -787,7 +787,9 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)\n \t\t\trx_ring->vid &= ~FM10K_VLAN_CLEAR;\n \t}\n \n-\t/* Do not remove default VLAN ID related entries from VLAN and MAC tables */\n+\t/* Do not remove default VLAN ID related entries from VLAN and MAC\n+\t * tables\n+\t */\n \tif (!set && vid == hw->mac.default_vid)\n \t\treturn 0;\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex fd433cf..4aecf5a 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -180,7 +180,8 @@ static void fm10k_reinit(struct fm10k_intfc *interface)\n \n \terr = fm10k_init_queueing_scheme(interface);\n \tif (err) {\n-\t\tdev_err(&interface->pdev->dev, \"init_queueing_scheme failed: %d\\n\", err);\n+\t\tdev_err(&interface->pdev->dev,\n+\t\t\t\"init_queueing_scheme failed: %d\\n\", err);\n \t\tgoto reinit_err;\n \t}\n \n@@ -1895,17 +1896,18 @@ static void fm10k_slot_warn(struct fm10k_intfc *interface)\n \t\treturn;\n \t}\n \n-\tif (max_gts < expected_gts) {\n-\t\tdev_warn(&interface->pdev->dev,\n-\t\t\t \"This device requires %dGT/s of bandwidth for optimal performance.\\n\",\n-\t\t\t expected_gts);\n-\t\tdev_warn(&interface->pdev->dev,\n-\t\t\t \"A %sslot with x%d lanes is suggested.\\n\",\n-\t\t\t (hw->bus_caps.speed == fm10k_bus_speed_2500 ? \"2.5GT/s \" :\n-\t\t\t hw->bus_caps.speed == fm10k_bus_speed_5000 ? \"5.0GT/s \" :\n-\t\t\t hw->bus_caps.speed == fm10k_bus_speed_8000 ? \"8.0GT/s \" : \"\"),\n-\t\t\t hw->bus_caps.width);\n-\t}\n+\tif (max_gts >= expected_gts)\n+\t\treturn;\n+\n+\tdev_warn(&interface->pdev->dev,\n+\t\t \"This device requires %dGT/s of bandwidth for optimal performance.\\n\",\n+\t\t expected_gts);\n+\tdev_warn(&interface->pdev->dev,\n+\t\t \"A %sslot with x%d lanes is suggested.\\n\",\n+\t\t (hw->bus_caps.speed == fm10k_bus_speed_2500 ? \"2.5GT/s \" :\n+\t\t hw->bus_caps.speed == fm10k_bus_speed_5000 ? \"5.0GT/s \" :\n+\t\t hw->bus_caps.speed == fm10k_bus_speed_8000 ? \"8.0GT/s \" : \"\"),\n+\t\t hw->bus_caps.width);\n }\n \n /**\n@@ -2337,7 +2339,8 @@ static void fm10k_io_resume(struct pci_dev *pdev)\n \n \terr = fm10k_init_queueing_scheme(interface);\n \tif (err) {\n-\t\tdev_err(&interface->pdev->dev, \"init_queueing_scheme failed: %d\\n\", err);\n+\t\tdev_err(&interface->pdev->dev,\n+\t\t\t\"init_queueing_scheme failed: %d\\n\", err);\n \t\treturn;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\nindex 0183254..3b4bbff 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c\n@@ -1441,9 +1441,10 @@ static void fm10k_update_hw_stats_pf(struct fm10k_hw *hw,\n \t\txec = fm10k_read_hw_stats_32b(hw, FM10K_STATS_XEC, &stats->xec);\n \t\tvlan_drop = fm10k_read_hw_stats_32b(hw, FM10K_STATS_VLAN_DROP,\n \t\t\t\t\t\t &stats->vlan_drop);\n-\t\tloopback_drop = fm10k_read_hw_stats_32b(hw,\n-\t\t\t\t\t\t\tFM10K_STATS_LOOPBACK_DROP,\n-\t\t\t\t\t\t\t&stats->loopback_drop);\n+\t\tloopback_drop =\n+\t\t\tfm10k_read_hw_stats_32b(hw,\n+\t\t\t\t\t\tFM10K_STATS_LOOPBACK_DROP,\n+\t\t\t\t\t\t&stats->loopback_drop);\n \t\tnodesc_drop = fm10k_read_hw_stats_32b(hw,\n \t\t\t\t\t\t FM10K_STATS_NODESC_DROP,\n \t\t\t\t\t\t &stats->nodesc_drop);\n", "prefixes": [ "next-queue", "v2" ] }