@@ -157,7 +157,7 @@ typedef struct ODP_PACKED {
* IP protocol values (IPv4:'proto' or IPv6:'next_hdr')
* @{*/
#define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */
-#define _ODP_IPPROTO_ICMPv4 0x01 /**< Internet Control Message Protocol (1) */
+#define _ODP_IPPROTO_ICMPV4 0x01 /**< Internet Control Message Protocol (1) */
#define _ODP_IPPROTO_IPIP 0x04 /**< IP Encapsulation within IP (4) */
#define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */
#define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */
@@ -166,7 +166,7 @@ typedef struct ODP_PACKED {
#define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */
#define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */
#define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */
-#define _ODP_IPPROTO_ICMPv6 0x3A /**< Internet Control Message Protocol (58) */
+#define _ODP_IPPROTO_ICMPV6 0x3A /**< Internet Control Message Protocol (58) */
#define _ODP_IPPROTO_DEST 0x3C /**< IPv6 Destination header (60) */
#define _ODP_IPPROTO_SCTP 0x84 /**< Stream Control Transmission protocol
(132) */
@@ -2220,10 +2220,10 @@ int packet_parse_common_l3_l4(packet_parser_t *prs, const uint8_t *parseptr,
/* Parse Layer 4 headers */
switch (ip_proto) {
- case _ODP_IPPROTO_ICMPv4:
+ case _ODP_IPPROTO_ICMPV4:
/* Fall through */
- case _ODP_IPPROTO_ICMPv6:
+ case _ODP_IPPROTO_ICMPV6:
prs->input_flags.icmp = 1;
break;
From: Bill Fischofer <bill.fischofer@linaro.org> Change ODP_IPPROTO_ICMPv4 and ODP_IPPROTO_ICMPv6 to ODP_IPPROTO_ICMPV4 and ODP_IPPROTO_ICMPV6 to eliminate camelcase issues in ODP code. --- /** Email created from pull request 386 (Bill-Fischofer-Linaro:icmp-camelcase) ** https://github.com/Linaro/odp/pull/386 ** Patch: https://github.com/Linaro/odp/pull/386.patch ** Base sha: 6303c7d0e98fafe0f14c8c4dd9989b3b7633ebf4 ** Merge commit sha: 9b488231de93541f9a2c75a6e277921c55041427 **/ platform/linux-generic/include/protocols/ip.h | 4 ++-- platform/linux-generic/odp_packet.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)