Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1137063/?format=api
{ "id": 1137063, "url": "http://patchwork.ozlabs.org/api/patches/1137063/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190725095401.24590-6-anthony.l.nguyen@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": "<20190725095401.24590-6-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-07-25T09:53:55", "name": "[S25,06/12] ice: Sanitize ice_ena_vsi and ice_dis_vsi", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e03ca3f4552ab8c15a29a53abd0c3bcb065d904f", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20190725095401.24590-6-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 121514, "url": "http://patchwork.ozlabs.org/api/series/121514/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=121514", "date": "2019-07-25T09:53:50", "name": "[S25,01/12] ice: update ethtool stats on-demand", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/121514/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1137063/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1137063/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.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 45vgYR6LLrz9sBt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 26 Jul 2019 04:22:35 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C1B7D22686;\n\tThu, 25 Jul 2019 18:22:33 +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 girhZdpTqYzy; Thu, 25 Jul 2019 18:22:28 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8E46B226AF;\n\tThu, 25 Jul 2019 18:22:24 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 1F08B1BF9B6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:21 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1C47688157\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:21 +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 OodBHkO-BLzK for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:18 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 7A152873DC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 25 Jul 2019 18:22:18 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t25 Jul 2019 11:22:17 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga004.fm.intel.com with ESMTP; 25 Jul 2019 11:22:17 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,307,1559545200\"; d=\"scan'208\";a=\"193897609\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 25 Jul 2019 02:53:55 -0700", "Message-Id": "<20190725095401.24590-6-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190725095401.24590-1-anthony.l.nguyen@intel.com>", "References": "<20190725095401.24590-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S25 06/12] ice: Sanitize ice_ena_vsi and\n\tice_dis_vsi", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "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": "From: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n\n1. ndo_open and ndo_stop are implemented by ice_open and ice_stop\n respectively. When enabling/disabling VSIs, just call\n ice_open/ice_stop instead of ndo_open/ndo_stop.\n\n2. Rework logic around rtnl_lock/rtnl_unlock\n\n3. In ice_ena_vsi, remove an unnecessary stack variable and return\n 0 instead of err when __ICE_NEEDS_RESTART is not set.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_main.c | 24 +++++++++++------------\n 1 file changed, 11 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 920122443c0f..1abbea7a69e1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -436,13 +436,13 @@ static void ice_dis_vsi(struct ice_vsi *vsi, bool locked)\n \n \tif (vsi->type == ICE_VSI_PF && vsi->netdev) {\n \t\tif (netif_running(vsi->netdev)) {\n-\t\t\tif (!locked) {\n+\t\t\tif (!locked)\n \t\t\t\trtnl_lock();\n-\t\t\t\tvsi->netdev->netdev_ops->ndo_stop(vsi->netdev);\n+\n+\t\t\tice_stop(vsi->netdev);\n+\n+\t\t\tif (!locked)\n \t\t\t\trtnl_unlock();\n-\t\t\t} else {\n-\t\t\t\tvsi->netdev->netdev_ops->ndo_stop(vsi->netdev);\n-\t\t\t}\n \t\t} else {\n \t\t\tice_vsi_close(vsi);\n \t\t}\n@@ -3690,21 +3690,19 @@ static int ice_ena_vsi(struct ice_vsi *vsi, bool locked)\n \tint err = 0;\n \n \tif (!test_bit(__ICE_NEEDS_RESTART, vsi->state))\n-\t\treturn err;\n+\t\treturn 0;\n \n \tclear_bit(__ICE_NEEDS_RESTART, vsi->state);\n \n \tif (vsi->netdev && vsi->type == ICE_VSI_PF) {\n-\t\tstruct net_device *netd = vsi->netdev;\n-\n \t\tif (netif_running(vsi->netdev)) {\n-\t\t\tif (locked) {\n-\t\t\t\terr = netd->netdev_ops->ndo_open(netd);\n-\t\t\t} else {\n+\t\t\tif (!locked)\n \t\t\t\trtnl_lock();\n-\t\t\t\terr = netd->netdev_ops->ndo_open(netd);\n+\n+\t\t\terr = ice_open(vsi->netdev);\n+\n+\t\t\tif (!locked)\n \t\t\t\trtnl_unlock();\n-\t\t\t}\n \t\t}\n \t}\n \n", "prefixes": [ "S25", "06/12" ] }