Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/465191/?format=api
{ "id": 465191, "url": "http://patchwork.ozlabs.org/api/patches/465191/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1430161042-28494-5-git-send-email-catherine.sullivan@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": "<1430161042-28494-5-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-04-27T18:57:11", "name": "[net-next,S5,04/15] i40e: Remove incorrect #ifdef's", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "528360075d3aa3318ad303955eca8eca7b6059df", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1430161042-28494-5-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/465191/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/465191/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 hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id E7FA61400DE\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 28 Apr 2015 04:54:49 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2475D94E8D;\n\tMon, 27 Apr 2015 18:54:49 +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 8ksNnY+tDDMA; Mon, 27 Apr 2015 18:54:47 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 3712A94E7B;\n\tMon, 27 Apr 2015 18:54:47 +0000 (UTC)", "from whitealder.osuosl.org (whitealder.osuosl.org\n\t[140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id F04D81C21C0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 27 Apr 2015 18:54:44 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id ECA728B8A7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 27 Apr 2015 18:54:44 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id mzRb4iWQFSwz for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 27 Apr 2015 18:54:44 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8CCFE8B694\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 27 Apr 2015 18:54:44 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga102.fm.intel.com with ESMTP; 27 Apr 2015 11:54:44 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby FMSMGA003.fm.intel.com with ESMTP; 27 Apr 2015 11:54:44 -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.11,658,1422950400\"; d=\"scan'208\";a=\"486315464\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 27 Apr 2015 14:57:11 -0400", "Message-Id": "<1430161042-28494-5-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1430161042-28494-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1430161042-28494-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [net-next S5 04/15] i40e: Remove incorrect\n\t#ifdef's", "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: Carolyn Wyborny <carolyn.wyborny@intel.com>\n\nThis patch removes some #ifdef's that should not be there. They\nwere stopping code that is needed from being compiled in.\n\nWith these #ifdef's removed, changes are needed in the driver\nto fix some compile errors: adding missing parameters to\nthe definition of ndo_bridge_setlink and a ndo_dflt_brige_getlink call.\n\nSigned-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>\nSigned-off-by: Catherine Sullivan <catherine.sullivan@intel.com>\nChange-ID: I5516614e1bc50b6bca0647cef971bc96161ba2de\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 15 ++++-----------\n 1 file changed, 4 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 9ec7f51..1b73979 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -7989,7 +7989,6 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],\n \treturn err;\n }\n \n-#ifdef HAVE_BRIDGE_ATTRIBS\n /**\n * i40e_ndo_bridge_setlink - Set the hardware bridge mode\n * @dev: the netdev being configured\n@@ -8003,7 +8002,8 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],\n * bridge mode enabled.\n **/\n static int i40e_ndo_bridge_setlink(struct net_device *dev,\n-\t\t\t\t struct nlmsghdr *nlh)\n+\t\t\t\t struct nlmsghdr *nlh,\n+\t\t\t\t u16 flags)\n {\n \tstruct i40e_netdev_priv *np = netdev_priv(dev);\n \tstruct i40e_vsi *vsi = np->vsi;\n@@ -8069,14 +8069,9 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev,\n * Return the mode in which the hardware bridge is operating in\n * i.e VEB or VEPA.\n **/\n-#ifdef HAVE_BRIDGE_FILTER\n static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n \t\t\t\t struct net_device *dev,\n \t\t\t\t u32 __always_unused filter_mask)\n-#else\n-static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n-\t\t\t\t struct net_device *dev)\n-#endif /* HAVE_BRIDGE_FILTER */\n {\n \tstruct i40e_netdev_priv *np = netdev_priv(dev);\n \tstruct i40e_vsi *vsi = np->vsi;\n@@ -8097,9 +8092,9 @@ static int i40e_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n \tif (!veb)\n \t\treturn 0;\n \n-\treturn ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode);\n+\treturn ndo_dflt_bridge_getlink(skb, pid, seq, dev, veb->bridge_mode, 0,\n+\t\t\t\t 0);\n }\n-#endif /* HAVE_BRIDGE_ATTRIBS */\n \n #define I40E_MAX_TUNNEL_HDR_LEN 80\n /**\n@@ -8154,10 +8149,8 @@ static const struct net_device_ops i40e_netdev_ops = {\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-#ifdef HAVE_BRIDGE_ATTRIBS\n \t.ndo_bridge_getlink\t= i40e_ndo_bridge_getlink,\n \t.ndo_bridge_setlink\t= i40e_ndo_bridge_setlink,\n-#endif /* HAVE_BRIDGE_ATTRIBS */\n \t.ndo_features_check\t= i40e_features_check,\n };\n \n", "prefixes": [ "net-next", "S5", "04/15" ] }