Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/925229/?format=api
{ "id": 925229, "url": "http://patchwork.ozlabs.org/api/patches/925229/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180604205125.5474.54894.stgit@ahduyck-green-test.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": "<20180604205125.5474.54894.stgit@ahduyck-green-test.jf.intel.com>", "list_archive_url": null, "date": "2018-06-04T20:51:25", "name": "[net-queue,v2,2/2] ixgbe: Move ipsec init function to before reset call", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a8f58bcc804087918b3245d5d8bed3f15ab4f80f", "submitter": { "id": 251, "url": "http://patchwork.ozlabs.org/api/people/251/?format=api", "name": "Duyck, Alexander H", "email": "alexander.h.duyck@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/20180604205125.5474.54894.stgit@ahduyck-green-test.jf.intel.com/mbox/", "series": [ { "id": 48488, "url": "http://patchwork.ozlabs.org/api/series/48488/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=48488", "date": "2018-06-04T20:51:20", "name": "ixgbe: ipsec fixes", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/48488/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/925229/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/925229/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@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 AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4106kK6Bwbz9rvt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Jun 2018 06:59:21 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 790E8226C6;\n\tMon, 4 Jun 2018 20:59:20 +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 Wa18540nVyhB; Mon, 4 Jun 2018 20:59:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 7A7CF2202B;\n\tMon, 4 Jun 2018 20:59:18 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9035F1BF54B\n\tfor <intel-wired-lan@osuosl.org>;\n\tMon, 4 Jun 2018 20:59:17 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8D23187215\n\tfor <intel-wired-lan@osuosl.org>;\n\tMon, 4 Jun 2018 20:59:17 +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 EvXX9Cg5F965 for <intel-wired-lan@osuosl.org>;\n\tMon, 4 Jun 2018 20:59:16 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id D465386E9E\n\tfor <intel-wired-lan@osuosl.org>;\n\tMon, 4 Jun 2018 20:59:16 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t04 Jun 2018 13:59:16 -0700", "from ahduyck-green-test.jf.intel.com ([10.166.244.179])\n\tby fmsmga001.fm.intel.com with ESMTP; 04 Jun 2018 13:59:16 -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.49,477,1520924400\"; d=\"scan'208\";a=\"61234463\"", "From": "Alexander Duyck <alexander.h.duyck@intel.com>", "To": "shannon.nelson@oracle.com, intel-wired-lan@osuosl.org, andre@tomt.net", "Date": "Mon, 04 Jun 2018 16:51:25 -0400", "Message-ID": "<20180604205125.5474.54894.stgit@ahduyck-green-test.jf.intel.com>", "In-Reply-To": "<20180604204931.5474.94068.stgit@ahduyck-green-test.jf.intel.com>", "References": "<20180604204931.5474.94068.stgit@ahduyck-green-test.jf.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-queue PATCH v2 2/2] ixgbe: Move ipsec init\n\tfunction to before reset call", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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": "This patch moves the ipsec init function in ixgbe_sw_init. This way it is a\nbit more consistent with the placement of similar initialization functions\nand is placed before the reset_hw call which should allow us to clean up\nany link issues that may be introduced by the fact that we force the link\nup if somehow the device had ipsec still enabled before the driver was\nloaded.\n\nIn addition to the function move it is necessary to change the assignment\nof netdev->features. The easiest way to do this is to just test for the\nexistance of adapter->ipsec and if it is present we set the feature bits.\n\nFixes: 49a94d74d948 (\"ixgbe: add ipsec engine start and stop routines\")\nReported-by: Andre Tomt <andre@tomt.net>\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 7 -------\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +++++++++--\n 2 files changed, 9 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\nindex 344a1f2..38d8cf7 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n@@ -1001,13 +1001,6 @@ void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter)\n \n \tadapter->netdev->xfrmdev_ops = &ixgbe_xfrmdev_ops;\n \n-#define IXGBE_ESP_FEATURES\t(NETIF_F_HW_ESP | \\\n-\t\t\t\t NETIF_F_HW_ESP_TX_CSUM | \\\n-\t\t\t\t NETIF_F_GSO_ESP)\n-\n-\tadapter->netdev->features |= IXGBE_ESP_FEATURES;\n-\tadapter->netdev->hw_enc_features |= IXGBE_ESP_FEATURES;\n-\n \treturn;\n \n err2:\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex 8cab0c5..e1d46e4 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -6128,6 +6128,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,\n #ifdef CONFIG_IXGBE_DCB\n \tixgbe_init_dcb(adapter);\n #endif\n+\tixgbe_init_ipsec_offload(adapter);\n \n \t/* default flow control settings */\n \thw->fc.requested_mode = ixgbe_fc_full;\n@@ -10488,6 +10489,14 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tif (hw->mac.type >= ixgbe_mac_82599EB)\n \t\tnetdev->features |= NETIF_F_SCTP_CRC | NETIF_F_GSO_UDP_L4;\n \n+#ifdef CONFIG_XFRM_OFFLOAD\n+#define IXGBE_ESP_FEATURES\t(NETIF_F_HW_ESP | \\\n+\t\t\t\t NETIF_F_HW_ESP_TX_CSUM | \\\n+\t\t\t\t NETIF_F_GSO_ESP)\n+\n+\tif (adapter->ipsec)\n+\t\tnetdev->features |= IXGBE_ESP_FEATURES;\n+#endif\n \t/* copy netdev features into list of user selectable features */\n \tnetdev->hw_features |= netdev->features |\n \t\t\t NETIF_F_HW_VLAN_CTAG_FILTER |\n@@ -10550,8 +10559,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t\t\t\t\t NETIF_F_FCOE_MTU;\n \t}\n #endif /* IXGBE_FCOE */\n-\tixgbe_init_ipsec_offload(adapter);\n-\n \tif (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)\n \t\tnetdev->hw_features |= NETIF_F_LRO;\n \tif (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)\n", "prefixes": [ "net-queue", "v2", "2/2" ] }