Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/531501/?format=api
{ "id": 531501, "url": "http://patchwork.ozlabs.org/api/patches/531501/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445018231-3196-1-git-send-email-jacob.e.keller@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": "<1445018231-3196-1-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-10-16T17:56:55", "name": "[next-queue,v5,01/17] fm10k: conditionally compile DCB and DebugFS support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7d070efe421aac68b1b02f01409f9b1127a12a33", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/1445018231-3196-1-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/531501/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/531501/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 A1C551402B2\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 17 Oct 2015 04:57:21 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id F105F332AE;\n\tFri, 16 Oct 2015 17:57: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 V-QT-zaen9X8; Fri, 16 Oct 2015 17:57:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id B839832983;\n\tFri, 16 Oct 2015 17:57:16 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 36F531C16C8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 32DC18B1B3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:15 +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 z-oEGxrDLeeD for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:13 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 9D39D8ACA5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:13 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga103.jf.intel.com with ESMTP; 16 Oct 2015 10:57:13 -0700", "from jekeller-desk.amr.corp.intel.com ([134.134.3.123])\n\tby fmsmga001.fm.intel.com with ESMTP; 16 Oct 2015 10:57:14 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.17,689,1437462000\"; d=\"scan'208\";a=\"812781729\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Fri, 16 Oct 2015 10:56:55 -0700", "Message-Id": "<1445018231-3196-1-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.6.1.264.gbab76a9", "Subject": "[Intel-wired-lan] [next-queue v5 01/17] fm10k: conditionally\n\tcompile DCB and DebugFS support", "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": "Rather than wrapping fm10k_dcbnl.c and fm10k_debugfs.c support with\n #ifdef blocks, just conditionally include the .o files in the Makefile.\nAlso, since we're modifying it, update the copyright year on the\nMakefile.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/Makefile | 20 +++++++++++++++-----\n drivers/net/ethernet/intel/fm10k/fm10k.h | 4 ++++\n drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 4 ----\n drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 4 ----\n 4 files changed, 19 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/Makefile b/drivers/net/ethernet/intel/fm10k/Makefile\nindex 08859dd220a8..b006ff66d028 100644\n--- a/drivers/net/ethernet/intel/fm10k/Makefile\n+++ b/drivers/net/ethernet/intel/fm10k/Makefile\n@@ -1,7 +1,7 @@\n ################################################################################\n #\n # Intel Ethernet Switch Host Interface Driver\n-# Copyright(c) 2013 - 2014 Intel Corporation.\n+# Copyright(c) 2013 - 2015 Intel Corporation.\n #\n # This program is free software; you can redistribute it and/or modify it\n # under the terms and conditions of the GNU General Public License,\n@@ -27,7 +27,17 @@\n \n obj-$(CONFIG_FM10K) += fm10k.o\n \n-fm10k-objs := fm10k_main.o fm10k_common.o fm10k_pci.o \\\n-\t fm10k_netdev.o fm10k_ethtool.o fm10k_pf.o fm10k_vf.o \\\n-\t fm10k_mbx.o fm10k_iov.o fm10k_tlv.o \\\n-\t fm10k_debugfs.o fm10k_ptp.o fm10k_dcbnl.o\n+fm10k-y := fm10k_main.o \\\n+\t fm10k_common.o \\\n+\t fm10k_pci.o \\\n+\t fm10k_ptp.o \\\n+\t fm10k_netdev.o \\\n+\t fm10k_ethtool.o \\\n+\t fm10k_pf.o \\\n+\t fm10k_vf.o \\\n+\t fm10k_mbx.o \\\n+\t fm10k_iov.o \\\n+\t fm10k_tlv.o\n+\n+fm10k-$(CONFIG_DEBUG_FS) += fm10k_debugfs.o\n+fm10k-$(CONFIG_DCB) += fm10k_dcbnl.o\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 48809e5d3f79..aa9674a3d9ee 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -551,5 +551,9 @@ int fm10k_get_ts_config(struct net_device *netdev, struct ifreq *ifr);\n int fm10k_set_ts_config(struct net_device *netdev, struct ifreq *ifr);\n \n /* DCB */\n+#ifdef CONFIG_DCB\n void fm10k_dcbnl_set_ops(struct net_device *dev);\n+#else\n+static inline void fm10k_dcbnl_set_ops(void) {}\n+#endif\n #endif /* _FM10K_H_ */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\nindex 5c7a4d7662d8..2be4361839db 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c\n@@ -20,7 +20,6 @@\n \n #include \"fm10k.h\"\n \n-#ifdef CONFIG_DCB\n /**\n * fm10k_dcbnl_ieee_getets - get the ETS configuration for the device\n * @dev: netdev interface for the device\n@@ -155,7 +154,6 @@ static const struct dcbnl_rtnl_ops fm10k_dcbnl_ops = {\n \t.setdcbx\t= fm10k_dcbnl_setdcbx,\n };\n \n-#endif /* CONFIG_DCB */\n /**\n * fm10k_dcbnl_set_ops - Configures dcbnl ops pointer for netdev\n * @dev: netdev interface for the device\n@@ -164,11 +162,9 @@ static const struct dcbnl_rtnl_ops fm10k_dcbnl_ops = {\n **/\n void fm10k_dcbnl_set_ops(struct net_device *dev)\n {\n-#ifdef CONFIG_DCB\n \tstruct fm10k_intfc *interface = netdev_priv(dev);\n \tstruct fm10k_hw *hw = &interface->hw;\n \n \tif (hw->mac.type == fm10k_mac_pf)\n \t\tdev->dcbnl_ops = &fm10k_dcbnl_ops;\n-#endif /* CONFIG_DCB */\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\nindex 5304bc1fbecd..5d6137faf7d1 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c\n@@ -18,8 +18,6 @@\n * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497\n */\n \n-#ifdef CONFIG_DEBUG_FS\n-\n #include \"fm10k.h\"\n \n #include <linux/debugfs.h>\n@@ -258,5 +256,3 @@ void fm10k_dbg_exit(void)\n \tdebugfs_remove_recursive(dbg_root);\n \tdbg_root = NULL;\n }\n-\n-#endif /* CONFIG_DEBUG_FS */\n", "prefixes": [ "next-queue", "v5", "01/17" ] }