Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 115,
    "url": "https://patches.dpdk.org/api/patches/115/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1406876916-24869-3-git-send-email-jingjing.wu@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": "<1406876916-24869-3-git-send-email-jingjing.wu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1406876916-24869-3-git-send-email-jingjing.wu@intel.com",
    "date": "2014-08-01T07:08:32",
    "name": "[dpdk-dev,2/6] lib/librte_net: fix the Marco conflict",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "497d654cd68f17a76893b1bfda6b6bb7ea1161ce",
    "submitter": {
        "id": 47,
        "url": "https://patches.dpdk.org/api/people/47/?format=api",
        "name": "Jingjing Wu",
        "email": "jingjing.wu@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1406876916-24869-3-git-send-email-jingjing.wu@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/115/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/115/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<wujingji@shecgisg004.sh.intel.com>",
        "Received": [
            "from mga03.intel.com (mga03.intel.com [143.182.124.21])\n\tby dpdk.org (Postfix) with ESMTP id 793D9B373\n\tfor <dev@dpdk.org>; Fri,  1 Aug 2014 09:06:54 +0200 (CEST)",
            "from azsmga001.ch.intel.com ([10.2.17.19])\n\tby azsmga101.ch.intel.com with ESMTP; 01 Aug 2014 00:08:56 -0700",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby azsmga001.ch.intel.com with ESMTP; 01 Aug 2014 00:08:52 -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 s7178p0d014886;\n\tFri, 1 Aug 2014 15:08:51 +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 s7178lta025041; Fri, 1 Aug 2014 15:08:49 +0800",
            "(from wujingji@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s7178llb025037; \n\tFri, 1 Aug 2014 15:08:47 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.01,778,1400050800\"; d=\"scan'208\";a=\"463889064\"",
        "From": "Jingjing Wu <jingjing.wu@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Fri,  1 Aug 2014 15:08:32 +0800",
        "Message-Id": "<1406876916-24869-3-git-send-email-jingjing.wu@intel.com>",
        "X-Mailer": "git-send-email 1.7.0.7",
        "In-Reply-To": "<1406876916-24869-1-git-send-email-jingjing.wu@intel.com>",
        "References": "<1406876916-24869-1-git-send-email-jingjing.wu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 2/6] lib/librte_net: fix the Marco conflict",
        "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>",
        "X-List-Received-Date": "Fri, 01 Aug 2014 07:06:55 -0000"
    },
    "content": "fix the Marco conflict between rte_ip.h and netinet/in.h\n\nSigned-off-by: jingjing.wu <jingjing.wu@intel.com>\n---\n lib/librte_net/rte_ip.h | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)",
    "diff": "diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h\nindex e3f65c1..0f0b3b0 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@@ -226,7 +228,8 @@ struct ipv4_hdr {\n #define IPPROTO_DIVERT   254  /**< divert pseudo-protocol */\n #define IPPROTO_RAW      255  /**< raw IP packet */\n #define IPPROTO_MAX      256  /**< maximum protocol number */\n-\n+#endif\n+#endif\n /*\n  * IPv4 address types\n  */\n",
    "prefixes": [
        "dpdk-dev",
        "2/6"
    ]
}