Patch Detail

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

{
    "id": 247,
    "url": "http://patches.dpdk.org/api/patches/247/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1409105634-29980-6-git-send-email-jingjing.wu@intel.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<1409105634-29980-6-git-send-email-jingjing.wu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1409105634-29980-6-git-send-email-jingjing.wu@intel.com",
    "date": "2014-08-27T02:13:52",
    "name": "[dpdk-dev,v2,5/7] fix the Marco conflict",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "e15e66434addc8c343abd010098c775cbef6ce0c",
    "submitter": {
        "id": 47,
        "url": "http://patches.dpdk.org/api/people/47/?format=api",
        "name": "Jingjing Wu",
        "email": "jingjing.wu@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1409105634-29980-6-git-send-email-jingjing.wu@intel.com/mbox/",
    "series": [],
    "comments": "http://patches.dpdk.org/api/patches/247/comments/",
    "check": "pending",
    "checks": "http://patches.dpdk.org/api/patches/247/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<wujingji@shecgisg004.sh.intel.com>",
        "Received": [
            "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id 77F22B375\n\tfor <dev@dpdk.org>; Wed, 27 Aug 2014 04:10:49 +0200 (CEST)",
            "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP; 26 Aug 2014 19:14:38 -0700",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby fmsmga001.fm.intel.com with ESMTP; 26 Aug 2014 19:14:37 -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 s7R2Eaxd006234;\n\tWed, 27 Aug 2014 10:14:36 +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 s7R2EXQr030125; Wed, 27 Aug 2014 10:14:35 +0800",
            "(from wujingji@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s7R2EXol030121; \n\tWed, 27 Aug 2014 10:14:33 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.04,408,1406617200\"; d=\"scan'208\";a=\"582158453\"",
        "From": "Jingjing Wu <jingjing.wu@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Wed, 27 Aug 2014 10:13:52 +0800",
        "Message-Id": "<1409105634-29980-6-git-send-email-jingjing.wu@intel.com>",
        "X-Mailer": "git-send-email 1.7.0.7",
        "In-Reply-To": "<1409105634-29980-1-git-send-email-jingjing.wu@intel.com>",
        "References": "<1409105634-29980-1-git-send-email-jingjing.wu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v2 5/7] 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": "Wed, 27 Aug 2014 02:10:50 -0000"
    },
    "content": "fix the Marco conflict between rte_ip.h and netinet/in.h\n \nSigned-off-by: jingjing.wu <jingjing.wu@intel.com>\nReviewed-by: Helin Zhang <helin.zhang@intel.com>\nReviewed-by: Jing Chen <jing.d.chen@intel.com>\nReviewed-by: Jijiang Liu <jijiang.liu@intel.com>\n \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..67b6c2d 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 /* _NETINET_IN_H_ */\n+#endif /* _NETINET_IN_H */\n /*\n  * IPv4 address types\n  */\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "5/7"
    ]
}