Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/542185/?format=api
{ "id": 542185, "url": "http://patchwork.ozlabs.org/api/patches/542185/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1447136740-77107-1-git-send-email-anjali.singhai@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": "<1447136740-77107-1-git-send-email-anjali.singhai@intel.com>", "list_archive_url": null, "date": "2015-11-10T06:25:35", "name": "[v3,1/6] i40e: Remove CONFIG_I40E_VXLAN", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "e9e7338c65edcc1672938a5f431f001222b47e64", "submitter": { "id": 65487, "url": "http://patchwork.ozlabs.org/api/people/65487/?format=api", "name": "Singhai, Anjali", "email": "anjali.singhai@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/1447136740-77107-1-git-send-email-anjali.singhai@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/542185/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/542185/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 868E41402B4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 10 Nov 2015 17:08:57 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6E11486E34;\n\tTue, 10 Nov 2015 06:08:56 +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 29h06Q5ZM8tU; Tue, 10 Nov 2015 06:08:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8F72B86E23;\n\tTue, 10 Nov 2015 06:08:55 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 3BCE61C105D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 10 Nov 2015 06:08:55 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 347D52723A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 10 Nov 2015 06:08:55 +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 AE0gEAijiK47 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 10 Nov 2015 06:08:53 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6652526F8E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 10 Nov 2015 06:08:53 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP; 09 Nov 2015 22:08:53 -0800", "from asinghai-cp.jf.intel.com ([134.134.3.84])\n\tby orsmga002.jf.intel.com with ESMTP; 09 Nov 2015 22:08:54 -0800" ], "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,269,1444719600\"; d=\"scan'208\";a=\"846712967\"", "From": "Anjali Singhai Jain <anjali.singhai@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 9 Nov 2015 22:25:35 -0800", "Message-Id": "<1447136740-77107-1-git-send-email-anjali.singhai@intel.com>", "X-Mailer": "git-send-email 1.8.1.4", "Subject": "[Intel-wired-lan] [PATCH v3 1/6] i40e: Remove CONFIG_I40E_VXLAN", "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": "If the kernel flag CONFIG_VXLAN is true or CONFIG_VXLAN_MODULE is true,\nenable VXLAN offload in the driver.\n\nv2: Fix bisection error for this patch series.\n\nSigned-off-by: Kiran Patil <kiran.patil@intel.com>\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\n---\n drivers/net/ethernet/intel/Kconfig | 11 -----------\n drivers/net/ethernet/intel/i40e/i40e.h | 4 ----\n drivers/net/ethernet/intel/i40e/i40e_main.c | 14 ++++----------\n 3 files changed, 4 insertions(+), 25 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig\nindex 4163b16..061e4e0 100644\n--- a/drivers/net/ethernet/intel/Kconfig\n+++ b/drivers/net/ethernet/intel/Kconfig\n@@ -269,17 +269,6 @@ config I40E\n \t To compile this driver as a module, choose M here. The module\n \t will be called i40e.\n \n-config I40E_VXLAN\n-\tbool \"Virtual eXtensible Local Area Network Support\"\n-\tdefault n\n-\tdepends on I40E && VXLAN && !(I40E=y && VXLAN=m)\n-\t---help---\n-\t This allows one to create VXLAN virtual interfaces that provide\n-\t Layer 2 Networks over Layer 3 Networks. VXLAN is often used\n-\t to tunnel virtual network infrastructure in virtualized environments.\n-\t Say Y here if you want to use Virtual eXtensible Local Area Network\n-\t (VXLAN) in the driver.\n-\n config I40E_DCB\n \tbool \"Data Center Bridging (DCB) Support\"\n \tdefault n\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex dde7ae7..ae0cf17 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -281,11 +281,9 @@ struct i40e_pf {\n \tu32 fd_atr_cnt;\n \tu32 fd_tcp_rule;\n \n-#ifdef CONFIG_I40E_VXLAN\n \t__be16 vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];\n \tu16 pending_vxlan_bitmap;\n \n-#endif\n \tenum i40e_interrupt_policy int_policy;\n \tu16 rx_itr_default;\n \tu16 tx_itr_default;\n@@ -322,9 +320,7 @@ struct i40e_pf {\n #define I40E_FLAG_FD_ATR_ENABLED\t\tBIT_ULL(22)\n #define I40E_FLAG_PTP\t\t\t\tBIT_ULL(25)\n #define I40E_FLAG_MFP_ENABLED\t\t\tBIT_ULL(26)\n-#ifdef CONFIG_I40E_VXLAN\n #define I40E_FLAG_VXLAN_FILTER_SYNC\t\tBIT_ULL(27)\n-#endif\n #define I40E_FLAG_PORT_ID_VALID\t\t\tBIT_ULL(28)\n #define I40E_FLAG_DCB_CAPABLE\t\t\tBIT_ULL(29)\n #define I40E_FLAG_RSS_AQ_CAPABLE\t\tBIT_ULL(31)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex e19a579..900cc57 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -27,7 +27,7 @@\n /* Local includes */\n #include \"i40e.h\"\n #include \"i40e_diag.h\"\n-#ifdef CONFIG_I40E_VXLAN\n+#if IS_ENABLED(CONFIG_VXLAN)\n #include <net/vxlan.h>\n #endif\n \n@@ -5334,7 +5334,7 @@ int i40e_open(struct net_device *netdev)\n \t\t\t\t\t\t TCP_FLAG_CWR) >> 16);\n \twr32(&pf->hw, I40E_GLLAN_TSOMSK_L, be32_to_cpu(TCP_FLAG_CWR) >> 16);\n \n-#ifdef CONFIG_I40E_VXLAN\n+#if IS_ENABLED(CONFIG_VXLAN)\n \tvxlan_get_rx_port(netdev);\n #endif\n \n@@ -7030,13 +7030,13 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)\n \ti40e_flush(hw);\n }\n \n-#ifdef CONFIG_I40E_VXLAN\n /**\n * i40e_sync_vxlan_filters_subtask - Sync the VSI filter list with HW\n * @pf: board private structure\n **/\n static void i40e_sync_vxlan_filters_subtask(struct i40e_pf *pf)\n {\n+#if IS_ENABLED(CONFIG_VXLAN)\n \tstruct i40e_hw *hw = &pf->hw;\n \ti40e_status ret;\n \t__be16 port;\n@@ -7070,9 +7070,9 @@ static void i40e_sync_vxlan_filters_subtask(struct i40e_pf *pf)\n \t\t\t}\n \t\t}\n \t}\n+#endif\n }\n \n-#endif\n /**\n * i40e_service_task - Run the driver's async subtasks\n * @work: pointer to work_struct containing our data\n@@ -7097,9 +7097,7 @@ static void i40e_service_task(struct work_struct *work)\n \ti40e_watchdog_subtask(pf);\n \ti40e_fdir_reinit_subtask(pf);\n \ti40e_sync_filters_subtask(pf);\n-#ifdef CONFIG_I40E_VXLAN\n \ti40e_sync_vxlan_filters_subtask(pf);\n-#endif\n \ti40e_clean_adminq_subtask(pf);\n \n \ti40e_service_event_complete(pf);\n@@ -8473,7 +8471,6 @@ static int i40e_set_features(struct net_device *netdev,\n \treturn 0;\n }\n \n-#ifdef CONFIG_I40E_VXLAN\n /**\n * i40e_get_vxlan_port_idx - Lookup a possibly offloaded for Rx UDP port\n * @pf: board private structure\n@@ -8568,7 +8565,6 @@ static void i40e_del_vxlan_port(struct net_device *netdev,\n \t}\n }\n \n-#endif\n static int i40e_get_phys_port_id(struct net_device *netdev,\n \t\t\t\t struct netdev_phys_item_id *ppid)\n {\n@@ -8793,10 +8789,8 @@ static const struct net_device_ops i40e_netdev_ops = {\n \t.ndo_get_vf_config\t= i40e_ndo_get_vf_config,\n \t.ndo_set_vf_link_state\t= i40e_ndo_set_vf_link_state,\n \t.ndo_set_vf_spoofchk\t= i40e_ndo_set_vf_spoofchk,\n-#ifdef CONFIG_I40E_VXLAN\n \t.ndo_add_vxlan_port\t= i40e_add_vxlan_port,\n \t.ndo_del_vxlan_port\t= i40e_del_vxlan_port,\n-#endif\n \t.ndo_get_phys_port_id\t= i40e_get_phys_port_id,\n \t.ndo_fdb_add\t\t= i40e_ndo_fdb_add,\n \t.ndo_features_check\t= i40e_features_check,\n", "prefixes": [ "v3", "1/6" ] }