Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/5862/?format=api
{ "id": 5862, "url": "https://patches.dpdk.org/api/patches/5862/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1435356878-10304-2-git-send-email-miguel.bernal.marin@linux.intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1435356878-10304-2-git-send-email-miguel.bernal.marin@linux.intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1435356878-10304-2-git-send-email-miguel.bernal.marin@linux.intel.com", "date": "2015-06-26T22:14:35", "name": "[dpdk-dev,v2,1/4] kni: fix igb_ndo_bridge_getlink to build with 4.1", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "49b774f308fa67de28af1ca8f2d1b16a421046ff", "submitter": { "id": 271, "url": "https://patches.dpdk.org/api/people/271/?format=api", "name": "Miguel Bernal Marin", "email": "miguel.bernal.marin@linux.intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1435356878-10304-2-git-send-email-miguel.bernal.marin@linux.intel.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/5862/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/5862/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id E43DCC9FE;\n\tSat, 27 Jun 2015 00:14:53 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 929F8C8BA\n\tfor <dev@dpdk.org>; Sat, 27 Jun 2015 00:14:50 +0200 (CEST)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP; 26 Jun 2015 15:14:49 -0700", "from mbernalm-mobl3.amr.corp.intel.com (HELO\n\tmbernalm-mobl3.zpn.intel.com) ([10.219.18.109])\n\tby orsmga003.jf.intel.com with ESMTP; 26 Jun 2015 15:14:49 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,687,1427785200\"; d=\"scan'208\";a=\"595535260\"", "From": "Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>", "To": "dev@dpdk.org", "Date": "Fri, 26 Jun 2015 17:14:35 -0500", "Message-Id": "<1435356878-10304-2-git-send-email-miguel.bernal.marin@linux.intel.com>", "X-Mailer": "git-send-email 2.4.4", "In-Reply-To": "<1435356878-10304-1-git-send-email-miguel.bernal.marin@linux.intel.com>", "References": "<1435259380-26251-1-git-send-email-miguel.bernal.marin@linux.intel.com>\n\t<1435356878-10304-1-git-send-email-miguel.bernal.marin@linux.intel.com>", "Subject": "[dpdk-dev] [PATCH v2 1/4] kni: fix igb_ndo_bridge_getlink to build\n\twith 4.1", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "ndo_bridge_getlink has changed in kernel release 4.1. It\nadds new parameter which brakes compilation.\n\nThis patch add the properly checks to fix it.\n\nFixes: 46c264daaaa5 (\"bridge/nl: remove wrong use of NLM_F_MULTI\")\n\nSigned-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>\n---\n lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 10 ++++++++++\n lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++\n 2 files changed, 15 insertions(+)", "diff": "diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c\nindex fa24d16..47198bb 100644\n--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c\n+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c\n@@ -2250,8 +2250,14 @@ static int igb_ndo_bridge_setlink(struct net_device *dev,\n }\n \n #ifdef HAVE_BRIDGE_FILTER\n+#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK\n+static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n+\t\t\t\t struct net_device *dev, u32 filter_mask,\n+\t\t\t\t int nlflags)\n+#else\n static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n \t\t\t\t struct net_device *dev, u32 filter_mask)\n+#endif /* HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK */\n #else\n static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n \t\t\t\t struct net_device *dev)\n@@ -2269,7 +2275,11 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,\n \t\tmode = BRIDGE_MODE_VEPA;\n \n #ifdef HAVE_NDO_FDB_ADD_VID\n+#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK\n+\treturn ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0, nlflags);\n+#else\n \treturn ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);\n+#endif /* HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK */\n #else\n \treturn ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);\n #endif /* HAVE_NDO_FDB_ADD_VID */\ndiff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h\nindex 44b9ebf..96d68a2 100644\n--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h\n+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h\n@@ -3891,4 +3891,9 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)\n #define vlan_tx_tag_present skb_vlan_tag_present\n #define HAVE_NDO_BRIDGE_SET_DEL_LINK_FLAGS\n #endif /* 4.0.0 */\n+\n+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) )\n+/* ndo_bridge_getlink adds new nlflags parameter */\n+#define HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK\n+#endif /* >= 4.1.0 */\n #endif /* _KCOMPAT_H_ */\n", "prefixes": [ "dpdk-dev", "v2", "1/4" ] }