Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/541150/?format=api
{ "id": 541150, "url": "http://patchwork.ozlabs.org/api/patches/541150/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1446852372-25480-11-git-send-email-joshua.a.hay@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": "<1446852372-25480-11-git-send-email-joshua.a.hay@intel.com>", "list_archive_url": null, "date": "2015-11-06T23:26:08", "name": "[next,S21,10/14] i40e: remove CONFIG_I40E_VXLAN", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "72f9c15e439e0f282025aa244c1d4a4197ba721e", "submitter": { "id": 19461, "url": "http://patchwork.ozlabs.org/api/people/19461/?format=api", "name": "Joshua Hay", "email": "joshua.a.hay@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/1446852372-25480-11-git-send-email-joshua.a.hay@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/541150/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/541150/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 0A17B1402C0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 7 Nov 2015 10:26:31 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 37B2C332BE;\n\tFri, 6 Nov 2015 23:26:30 +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 h4Oa97n4tfr3; Fri, 6 Nov 2015 23:26:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id B427E332BF;\n\tFri, 6 Nov 2015 23:26:23 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 9BC381C10EB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:21 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 99684A3EBE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:21 +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 wkGq6QPHNyHg for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:21 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0C7FDA3EDD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 6 Nov 2015 23:26:14 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga103.jf.intel.com with ESMTP; 06 Nov 2015 15:26:13 -0800", "from jahay1-mobl2.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.151])\n\tby FMSMGA003.fm.intel.com with ESMTP; 06 Nov 2015 15:26:13 -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,254,1444719600\"; d=\"scan'208\";a=\"595575990\"", "From": "Joshua Hay <joshua.a.hay@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 6 Nov 2015 15:26:08 -0800", "Message-Id": "<1446852372-25480-11-git-send-email-joshua.a.hay@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1446852372-25480-1-git-send-email-joshua.a.hay@intel.com>", "References": "<1446852372-25480-1-git-send-email-joshua.a.hay@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S21 10/14] i40e: remove\n\tCONFIG_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": "From: Jesse Brandeburg <jesse.brandeburg@intel.com>\n\nInstead of having our own custom symbol, we can just rely\non whether or not the kernel has the feature enabled.\n\nIn this case use IS_ENABLED(CONFIG_VXLAN) in order to handle\nbuilt-in or module in the current BKM way.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\nChange-ID: I5890fbb518ff8ed6bb07c3362fb0a8a829f9b241\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 | 12 ++++++------\n 3 files changed, 7 insertions(+), 20 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 050fc0f..adfc450 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -282,7 +282,7 @@ struct i40e_pf {\n \tu32 fd_atr_cnt;\n \tu32 fd_tcp_rule;\n \n-#ifdef CONFIG_I40E_VXLAN\n+#if IS_ENABLED(CONFIG_VXLAN)\n \t__be16 vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];\n \tu16 pending_vxlan_bitmap;\n \n@@ -323,9 +323,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 c6d4da4..4db7966 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@@ -5357,7 +5357,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@@ -7053,7 +7053,7 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf)\n \ti40e_flush(hw);\n }\n \n-#ifdef CONFIG_I40E_VXLAN\n+#if IS_ENABLED(CONFIG_VXLAN)\n /**\n * i40e_sync_vxlan_filters_subtask - Sync the VSI filter list with HW\n * @pf: board private structure\n@@ -7120,7 +7120,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+#if IS_ENABLED(CONFIG_VXLAN)\n \ti40e_sync_vxlan_filters_subtask(pf);\n #endif\n \ti40e_clean_adminq_subtask(pf);\n@@ -8496,7 +8496,7 @@ static int i40e_set_features(struct net_device *netdev,\n \treturn 0;\n }\n \n-#ifdef CONFIG_I40E_VXLAN\n+#if IS_ENABLED(CONFIG_VXLAN)\n /**\n * i40e_get_vxlan_port_idx - Lookup a possibly offloaded for Rx UDP port\n * @pf: board private structure\n@@ -8816,7 +8816,7 @@ 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+#if IS_ENABLED(CONFIG_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", "prefixes": [ "next", "S21", "10/14" ] }