Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/577770/?format=api
{ "id": 577770, "url": "http://patchwork.ozlabs.org/api/patches/577770/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1454487652-1545-7-git-send-email-sassmann@kpanic.de/", "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": "<1454487652-1545-7-git-send-email-sassmann@kpanic.de>", "list_archive_url": null, "date": "2016-02-03T08:20:52", "name": "[net-next,V2,6/6] e1000e: call ndo_stop() instead of dev_close() when running offline selftest", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ab5e8b2e82de10aab04bdc9ee2fa3897ca6b68ec", "submitter": { "id": 7508, "url": "http://patchwork.ozlabs.org/api/people/7508/?format=api", "name": "Stefan Assmann", "email": "sassmann@kpanic.de" }, "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/1454487652-1545-7-git-send-email-sassmann@kpanic.de/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/577770/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/577770/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id AB985140BCB\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 3 Feb 2016 19:21:56 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 043CE33AF1;\n\tWed, 3 Feb 2016 08:21:56 +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 DKZzZmZSIjIS; Wed, 3 Feb 2016 08:21:54 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id C3731339BB;\n\tWed, 3 Feb 2016 08:21:54 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id F3A761C07A5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Feb 2016 08:21:53 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id EE98D33852\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Feb 2016 08:21:53 +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 D0JIflwYDPPT for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Feb 2016 08:21:52 +0000 (UTC)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 526C833400\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 3 Feb 2016 08:21:52 +0000 (UTC)", "from int-mx10.intmail.prod.int.phx2.redhat.com\n\t(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])\n\tby mx1.redhat.com (Postfix) with ESMTPS id D87DCBBF53;\n\tWed, 3 Feb 2016 08:21:51 +0000 (UTC)", "from w541.redhat.com (ovpn-116-36.ams2.redhat.com [10.36.116.36])\n\tby int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with\n\tESMTP id u138LeHv022540; Wed, 3 Feb 2016 03:21:50 -0500" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "From": "Stefan Assmann <sassmann@kpanic.de>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 3 Feb 2016 09:20:52 +0100", "Message-Id": "<1454487652-1545-7-git-send-email-sassmann@kpanic.de>", "In-Reply-To": "<1454487652-1545-1-git-send-email-sassmann@kpanic.de>", "References": "<1454487652-1545-1-git-send-email-sassmann@kpanic.de>", "X-Scanned-By": "MIMEDefang 2.68 on 10.5.11.23", "Cc": "netdev@vger.kernel.org, davem@davemloft.net, sassmann@kpanic.de", "Subject": "[Intel-wired-lan] [PATCH net-next V2 6/6] e1000e: call ndo_stop()\n\tinstead of dev_close() when running offline selftest", "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": "Calling dev_close() causes IFF_UP to be cleared which will remove the\ninterfaces routes and some addresses. That's probably not what the user\nintended when running the offline selftest. Besides this does not happen\nif the interface is brought down before the test, so the current\nbehaviour is inconsistent.\nInstead call the net_device_ops ndo_stop function directly and avoid\ntouching IFF_UP at all.\n\nV2: rename e1000_open(), e1000_close() to e1000e_open(), e1000e_close()\nto avoid name clash with e1000.\n\nSigned-off-by: Stefan Assmann <sassmann@kpanic.de>\n---\n drivers/net/ethernet/intel/e1000e/e1000.h | 2 ++\n drivers/net/ethernet/intel/e1000e/ethtool.c | 4 ++--\n drivers/net/ethernet/intel/e1000e/netdev.c | 12 ++++++------\n 3 files changed, 10 insertions(+), 8 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h\nindex 1dc293b..52eb641 100644\n--- a/drivers/net/ethernet/intel/e1000e/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000e/e1000.h\n@@ -480,6 +480,8 @@ extern const char e1000e_driver_version[];\n void e1000e_check_options(struct e1000_adapter *adapter);\n void e1000e_set_ethtool_ops(struct net_device *netdev);\n \n+int e1000e_open(struct net_device *netdev);\n+int e1000e_close(struct net_device *netdev);\n void e1000e_up(struct e1000_adapter *adapter);\n void e1000e_down(struct e1000_adapter *adapter, bool reset);\n void e1000e_reinit_locked(struct e1000_adapter *adapter);\ndiff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c\nindex 6cab1f3..1e3973a 100644\n--- a/drivers/net/ethernet/intel/e1000e/ethtool.c\n+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c\n@@ -1816,7 +1816,7 @@ static void e1000_diag_test(struct net_device *netdev,\n \n \t\tif (if_running)\n \t\t\t/* indicate we're in test mode */\n-\t\t\tdev_close(netdev);\n+\t\t\te1000e_close(netdev);\n \n \t\tif (e1000_reg_test(adapter, &data[0]))\n \t\t\teth_test->flags |= ETH_TEST_FL_FAILED;\n@@ -1849,7 +1849,7 @@ static void e1000_diag_test(struct net_device *netdev,\n \n \t\tclear_bit(__E1000_TESTING, &adapter->state);\n \t\tif (if_running)\n-\t\t\tdev_open(netdev);\n+\t\t\te1000e_open(netdev);\n \t} else {\n \t\t/* Online tests */\n \ndiff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex c71ba1b..02449a0 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -4495,7 +4495,7 @@ static int e1000_test_msi(struct e1000_adapter *adapter)\n }\n \n /**\n- * e1000_open - Called when a network interface is made active\n+ * e1000e_open - Called when a network interface is made active\n * @netdev: network interface device structure\n *\n * Returns 0 on success, negative value on failure\n@@ -4506,7 +4506,7 @@ static int e1000_test_msi(struct e1000_adapter *adapter)\n * handler is registered with the OS, the watchdog timer is started,\n * and the stack is notified that the interface is ready.\n **/\n-static int e1000_open(struct net_device *netdev)\n+int e1000e_open(struct net_device *netdev)\n {\n \tstruct e1000_adapter *adapter = netdev_priv(netdev);\n \tstruct e1000_hw *hw = &adapter->hw;\n@@ -4604,7 +4604,7 @@ err_setup_tx:\n }\n \n /**\n- * e1000_close - Disables a network interface\n+ * e1000e_close - Disables a network interface\n * @netdev: network interface device structure\n *\n * Returns 0, this is not allowed to fail\n@@ -4614,7 +4614,7 @@ err_setup_tx:\n * needs to be disabled. A global MAC reset is issued to stop the\n * hardware, and all transmit and receive resources are freed.\n **/\n-static int e1000_close(struct net_device *netdev)\n+int e1000e_close(struct net_device *netdev)\n {\n \tstruct e1000_adapter *adapter = netdev_priv(netdev);\n \tstruct pci_dev *pdev = adapter->pdev;\n@@ -6920,8 +6920,8 @@ static int e1000_set_features(struct net_device *netdev,\n }\n \n static const struct net_device_ops e1000e_netdev_ops = {\n-\t.ndo_open\t\t= e1000_open,\n-\t.ndo_stop\t\t= e1000_close,\n+\t.ndo_open\t\t= e1000e_open,\n+\t.ndo_stop\t\t= e1000e_close,\n \t.ndo_start_xmit\t\t= e1000_xmit_frame,\n \t.ndo_get_stats64\t= e1000e_get_stats64,\n \t.ndo_set_rx_mode\t= e1000e_set_rx_mode,\n", "prefixes": [ "net-next", "V2", "6/6" ] }