Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1655/?format=api
{ "id": 1655, "url": "http://patches.dpdk.org/api/patches/1655/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1417088895-15568-1-git-send-email-thomas.monjalon@6wind.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": "<1417088895-15568-1-git-send-email-thomas.monjalon@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1417088895-15568-1-git-send-email-thomas.monjalon@6wind.com", "date": "2014-11-27T11:48:15", "name": "[dpdk-dev] net: fix conflict with libc", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "1962f091c8a45d8f93f3431b2efc3fce4c6b7b3b", "submitter": { "id": 1, "url": "http://patches.dpdk.org/api/people/1/?format=api", "name": "Thomas Monjalon", "email": "thomas.monjalon@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1417088895-15568-1-git-send-email-thomas.monjalon@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/1655/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/1655/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 DA4EA2E81;\n\tThu, 27 Nov 2014 12:48:49 +0100 (CET)", "from mail-wg0-f42.google.com (mail-wg0-f42.google.com\n\t[74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 61D49231C\n\tfor <dev@dpdk.org>; Thu, 27 Nov 2014 12:48:48 +0100 (CET)", "by mail-wg0-f42.google.com with SMTP id z12so6288395wgg.15\n\tfor <dev@dpdk.org>; Thu, 27 Nov 2014 03:48:47 -0800 (PST)", "from localhost.localdomain (136-92-190-109.dsl.ovh.fr.\n\t[109.190.92.136]) by mx.google.com with ESMTPSA id\n\tmc10sm24900174wic.24.2014.11.27.03.48.44 for <dev@dpdk.org>\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 27 Nov 2014 03:48:46 -0800 (PST)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=XfXlfOarknO0IK886ka2XIGG5AH7Pgjbez7SEgR5oYE=;\n\tb=BaKcKDPgt0ZIIhV9RU3hwWR/iM4VEmTKEpxOVRNyQydKb24Y8o+wQGdM80kuMlj9V0\n\tDhWGd9ljZfn1yjnNv5rVR5EfkO94AacxsBe1eQ+xlXvodl46ybFDiSHGDC7n92LVKjPN\n\tQ/pBu14pmyPWcKQZqlmuqo3E57OuApcyg3DMDKTav9vNuU6QH7gd9plh1mSPyVWruW3z\n\tqvoJH6mhMJiyMDl4LuS4kK+HrPOR4PS9L63EwaOqfhuCLCi+osU5qzABJIISmahXYg7l\n\tOeEdyGaWajcB/drdvs+LdUv1uAXY+UxKWy/LL9SfrHkwWN9FFfNl0GXJGS/GgzQ8hBiO\n\tzTIA==", "X-Gm-Message-State": "ALoCoQnc94nNXjDZdyafjrp9+tSZVchbCd2tzSnUB1/EHCT1TW3UUWgDLhkUcDEWkWi2Hk9vhCxs", "X-Received": "by 10.180.19.234 with SMTP id i10mr51637384wie.28.1417088927246; \n\tThu, 27 Nov 2014 03:48:47 -0800 (PST)", "From": "Thomas Monjalon <thomas.monjalon@6wind.com>", "To": "dev@dpdk.org", "Date": "Thu, 27 Nov 2014 12:48:15 +0100", "Message-Id": "<1417088895-15568-1-git-send-email-thomas.monjalon@6wind.com>", "X-Mailer": "git-send-email 2.1.3", "In-Reply-To": "<20141117141708.GE17886@hmsreliant.think-freely.org>", "References": "<20141117141708.GE17886@hmsreliant.think-freely.org>", "Subject": "[dpdk-dev] [PATCH] net: fix conflict with libc", "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": "It was impossible to include netinet/in.h and rte_ip.h\nbecause the IP protocols were redefined.\nIt is removed because useless.\n\nSigned-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>\n---\n app/test-pmd/icmpecho.c | 4 ++\n lib/librte_net/rte_ip.h | 112 +-----------------------------------------------\n 2 files changed, 5 insertions(+), 111 deletions(-)", "diff": "diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c\nindex 774924e..c25a54b 100644\n--- a/app/test-pmd/icmpecho.c\n+++ b/app/test-pmd/icmpecho.c\n@@ -221,12 +221,16 @@ ip_proto_name(uint8_t ip_proto)\n \tif (ip_proto < sizeof(ip_proto_names) / sizeof(ip_proto_names[0]))\n \t\treturn ip_proto_names[ip_proto];\n \tswitch (ip_proto) {\n+#ifdef IPPROTO_PGM\n \tcase IPPROTO_PGM: /**< PGM */\n \t\treturn \"PGM\";\n+#endif\n \tcase IPPROTO_SCTP: /**< Stream Control Transport Protocol */\n \t\treturn \"SCTP\";\n+#ifdef IPPROTO_DIVERT\n \tcase IPPROTO_DIVERT: /**< divert pseudo-protocol */\n \t\treturn \"DIVERT\";\n+#endif\n \tcase IPPROTO_RAW: /**< raw IP packet */\n \t\treturn \"RAW\";\n \tdefault:\ndiff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h\nindex 20c3ae1..61e4457 100644\n--- a/lib/librte_net/rte_ip.h\n+++ b/lib/librte_net/rte_ip.h\n@@ -78,6 +78,7 @@\n */\n \n #include <stdint.h>\n+#include <netinet/in.h>\n \n #include <rte_memcpy.h>\n #include <rte_byteorder.h>\n@@ -121,117 +122,6 @@ struct ipv4_hdr {\n \n #define\tIPV4_HDR_OFFSET_UNITS\t8\n \n-/* IPv4 protocols */\n-#define IPPROTO_IP 0 /**< dummy for IP */\n-#define IPPROTO_HOPOPTS 0 /**< IP6 hop-by-hop options */\n-#define IPPROTO_ICMP 1 /**< control message protocol */\n-#define IPPROTO_IGMP 2 /**< group mgmt protocol */\n-#define IPPROTO_GGP 3 /**< gateway^2 (deprecated) */\n-#define IPPROTO_IPV4 4 /**< IPv4 encapsulation */\n-#define IPPROTO_TCP 6 /**< tcp */\n-#define IPPROTO_ST 7 /**< Stream protocol II */\n-#define IPPROTO_EGP 8 /**< exterior gateway protocol */\n-#define IPPROTO_PIGP 9 /**< private interior gateway */\n-#define IPPROTO_RCCMON 10 /**< BBN RCC Monitoring */\n-#define IPPROTO_NVPII 11 /**< network voice protocol*/\n-#define IPPROTO_PUP 12 /**< pup */\n-#define IPPROTO_ARGUS 13 /**< Argus */\n-#define IPPROTO_EMCON 14 /**< EMCON */\n-#define IPPROTO_XNET 15 /**< Cross Net Debugger */\n-#define IPPROTO_CHAOS 16 /**< Chaos*/\n-#define IPPROTO_UDP 17 /**< user datagram protocol */\n-#define IPPROTO_MUX 18 /**< Multiplexing */\n-#define IPPROTO_MEAS 19 /**< DCN Measurement Subsystems */\n-#define IPPROTO_HMP 20 /**< Host Monitoring */\n-#define IPPROTO_PRM 21 /**< Packet Radio Measurement */\n-#define IPPROTO_IDP 22 /**< xns idp */\n-#define IPPROTO_TRUNK1 23 /**< Trunk-1 */\n-#define IPPROTO_TRUNK2 24 /**< Trunk-2 */\n-#define IPPROTO_LEAF1 25 /**< Leaf-1 */\n-#define IPPROTO_LEAF2 26 /**< Leaf-2 */\n-#define IPPROTO_RDP 27 /**< Reliable Data */\n-#define IPPROTO_IRTP 28 /**< Reliable Transaction */\n-#define IPPROTO_TP 29 /**< tp-4 w/ class negotiation */\n-#define IPPROTO_BLT 30 /**< Bulk Data Transfer */\n-#define IPPROTO_NSP 31 /**< Network Services */\n-#define IPPROTO_INP 32 /**< Merit Internodal */\n-#define IPPROTO_SEP 33 /**< Sequential Exchange */\n-#define IPPROTO_3PC 34 /**< Third Party Connect */\n-#define IPPROTO_IDPR 35 /**< InterDomain Policy Routing */\n-#define IPPROTO_XTP 36 /**< XTP */\n-#define IPPROTO_DDP 37 /**< Datagram Delivery */\n-#define IPPROTO_CMTP 38 /**< Control Message Transport */\n-#define IPPROTO_TPXX 39 /**< TP++ Transport */\n-#define IPPROTO_IL 40 /**< IL transport protocol */\n-#define IPPROTO_IPV6 41 /**< IP6 header */\n-#define IPPROTO_SDRP 42 /**< Source Demand Routing */\n-#define IPPROTO_ROUTING 43 /**< IP6 routing header */\n-#define IPPROTO_FRAGMENT 44 /**< IP6 fragmentation header */\n-#define IPPROTO_IDRP 45 /**< InterDomain Routing*/\n-#define IPPROTO_RSVP 46 /**< resource reservation */\n-#define IPPROTO_GRE 47 /**< General Routing Encap. */\n-#define IPPROTO_MHRP 48 /**< Mobile Host Routing */\n-#define IPPROTO_BHA 49 /**< BHA */\n-#define IPPROTO_ESP 50 /**< IP6 Encap Sec. Payload */\n-#define IPPROTO_AH 51 /**< IP6 Auth Header */\n-#define IPPROTO_INLSP 52 /**< Integ. Net Layer Security */\n-#define IPPROTO_SWIPE 53 /**< IP with encryption */\n-#define IPPROTO_NHRP 54 /**< Next Hop Resolution */\n-/* 55-57: Unassigned */\n-#define IPPROTO_ICMPV6 58 /**< ICMP6 */\n-#define IPPROTO_NONE 59 /**< IP6 no next header */\n-#define IPPROTO_DSTOPTS 60 /**< IP6 destination option */\n-#define IPPROTO_AHIP 61 /**< any host internal protocol */\n-#define IPPROTO_CFTP 62 /**< CFTP */\n-#define IPPROTO_HELLO 63 /**< \"hello\" routing protocol */\n-#define IPPROTO_SATEXPAK 64 /**< SATNET/Backroom EXPAK */\n-#define IPPROTO_KRYPTOLAN 65 /**< Kryptolan */\n-#define IPPROTO_RVD 66 /**< Remote Virtual Disk */\n-#define IPPROTO_IPPC 67 /**< Pluribus Packet Core */\n-#define IPPROTO_ADFS 68 /**< Any distributed FS */\n-#define IPPROTO_SATMON 69 /**< Satnet Monitoring */\n-#define IPPROTO_VISA 70 /**< VISA Protocol */\n-#define IPPROTO_IPCV 71 /**< Packet Core Utility */\n-#define IPPROTO_CPNX 72 /**< Comp. Prot. Net. Executive */\n-#define IPPROTO_CPHB 73 /**< Comp. Prot. HeartBeat */\n-#define IPPROTO_WSN 74 /**< Wang Span Network */\n-#define IPPROTO_PVP 75 /**< Packet Video Protocol */\n-#define IPPROTO_BRSATMON 76 /**< BackRoom SATNET Monitoring */\n-#define IPPROTO_ND 77 /**< Sun net disk proto (temp.) */\n-#define IPPROTO_WBMON 78 /**< WIDEBAND Monitoring */\n-#define IPPROTO_WBEXPAK 79 /**< WIDEBAND EXPAK */\n-#define IPPROTO_EON 80 /**< ISO cnlp */\n-#define IPPROTO_VMTP 81 /**< VMTP */\n-#define IPPROTO_SVMTP 82 /**< Secure VMTP */\n-#define IPPROTO_VINES 83 /**< Banyon VINES */\n-#define IPPROTO_TTP 84 /**< TTP */\n-#define IPPROTO_IGP 85 /**< NSFNET-IGP */\n-#define IPPROTO_DGP 86 /**< dissimilar gateway prot. */\n-#define IPPROTO_TCF 87 /**< TCF */\n-#define IPPROTO_IGRP 88 /**< Cisco/GXS IGRP */\n-#define IPPROTO_OSPFIGP 89 /**< OSPFIGP */\n-#define IPPROTO_SRPC 90 /**< Strite RPC protocol */\n-#define IPPROTO_LARP 91 /**< Locus Address Resoloution */\n-#define IPPROTO_MTP 92 /**< Multicast Transport */\n-#define IPPROTO_AX25 93 /**< AX.25 Frames */\n-#define IPPROTO_IPEIP 94 /**< IP encapsulated in IP */\n-#define IPPROTO_MICP 95 /**< Mobile Int.ing control */\n-#define IPPROTO_SCCSP 96 /**< Semaphore Comm. security */\n-#define IPPROTO_ETHERIP 97 /**< Ethernet IP encapsulation */\n-#define IPPROTO_ENCAP 98 /**< encapsulation header */\n-#define IPPROTO_APES 99 /**< any private encr. scheme */\n-#define IPPROTO_GMTP 100 /**< GMTP */\n-#define IPPROTO_IPCOMP 108 /**< payload compression (IPComp) */\n-/* 101-254: Partly Unassigned */\n-#define IPPROTO_PIM 103 /**< Protocol Independent Mcast */\n-#define IPPROTO_PGM 113 /**< PGM */\n-#define IPPROTO_SCTP 132 /**< Stream Control Transport Protocol */\n-/* 255: Reserved */\n-/* BSD Private, local use, namespace incursion */\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 /*\n * IPv4 address types\n */\n", "prefixes": [ "dpdk-dev" ] }