Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/653/?format=api
http://patchwork.dpdk.org/api/patches/653/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1412045348-18543-1-git-send-email-jingjing.wu@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1412045348-18543-1-git-send-email-jingjing.wu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1412045348-18543-1-git-send-email-jingjing.wu@intel.com", "date": "2014-09-30T02:49:08", "name": "[dpdk-dev] llib/ibrte_net: workaround to avoid macro conflict", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "596b20189ec9d33487ee51b7024cbc8a690e0446", "submitter": { "id": 47, "url": "http://patchwork.dpdk.org/api/people/47/?format=api", "name": "Jingjing Wu", "email": "jingjing.wu@intel.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1412045348-18543-1-git-send-email-jingjing.wu@intel.com/mbox/", "series": [], "comments": "http://patchwork.dpdk.org/api/patches/653/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/653/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 F095668FD;\n\tTue, 30 Sep 2014 04:42:40 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 373DC5902\n\tfor <dev@dpdk.org>; Tue, 30 Sep 2014 04:42:38 +0200 (CEST)", "from azsmga001.ch.intel.com ([10.2.17.19])\n\tby orsmga103.jf.intel.com with ESMTP; 29 Sep 2014 19:47:01 -0700", "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby azsmga001.ch.intel.com with ESMTP; 29 Sep 2014 19:49:14 -0700", "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id s8U2nBK2001228;\n\tTue, 30 Sep 2014 10:49:12 +0800", "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid s8U2n97r018578; Tue, 30 Sep 2014 10:49:11 +0800", "(from wujingji@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s8U2n9UK018574; \n\tTue, 30 Sep 2014 10:49:09 +0800" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.04,624,1406617200\"; d=\"scan'208\";a=\"480884494\"", "From": "Jingjing Wu <jingjing.wu@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 30 Sep 2014 10:49:08 +0800", "Message-Id": "<1412045348-18543-1-git-send-email-jingjing.wu@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "Subject": "[dpdk-dev] [PATCH] llib/ibrte_net: workaround to avoid macro\n\tconflict", "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": "Macros such as IPPROTO_TCP, IPPROTO_UDP are already defined in <netinet/in.h>.\nIf user's application includes <netinet/in.h> and rte_ip.h at the same time,\nthere will be conflict error.\n\nThis patch uses the way \"#ifndef #endif\" to avoid the conflict. \n\nSigned-off-by: Jingjing Wu <jingjing.wu@intel.com>\n---\n lib/librte_net/rte_ip.h | 5 +++++\n 1 file changed, 5 insertions(+)", "diff": "diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h\nindex e3f65c1..2bcb479 100644\n--- a/lib/librte_net/rte_ip.h\n+++ b/lib/librte_net/rte_ip.h\n@@ -116,6 +116,8 @@ struct ipv4_hdr {\n \n #define\tIPV4_HDR_OFFSET_UNITS\t8\n \n+#ifndef _NETINET_IN_H\n+#ifndef _NETINET_IN_H_\n /* IPv4 protocols */\n #define IPPROTO_IP 0 /**< dummy for IP */\n #define IPPROTO_HOPOPTS 0 /**< IP6 hop-by-hop options */\n@@ -227,6 +229,9 @@ struct ipv4_hdr {\n #define IPPROTO_RAW 255 /**< raw IP packet */\n #define IPPROTO_MAX 256 /**< maximum protocol number */\n \n+#endif /*_NETINET_IN_H_*/\n+#endif /*_NETINET_IN_H*/\n+\n /*\n * IPv4 address types\n */\n", "prefixes": [ "dpdk-dev" ] }{ "id": 653, "url": "