git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples/power: remove double copy of FIFO path
[dpdk.git]
/
examples
/
flow_classify
/
flow_classify.c
diff --git
a/examples/flow_classify/flow_classify.c
b/examples/flow_classify/flow_classify.c
index
dfb7db1
..
bc7f43e
100644
(file)
--- a/
examples/flow_classify/flow_classify.c
+++ b/
examples/flow_classify/flow_classify.c
@@
-99,7
+99,7
@@
static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
.field_index = PROTO_FIELD_IPV4,
.input_index = PROTO_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
.field_index = PROTO_FIELD_IPV4,
.input_index = PROTO_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
- offsetof(struct ipv4_hdr, next_proto_id),
+ offsetof(struct
rte_
ipv4_hdr, next_proto_id),
},
/* next input field (IPv4 source address) - 4 consecutive bytes. */
{
},
/* next input field (IPv4 source address) - 4 consecutive bytes. */
{
@@
-109,7
+109,7
@@
static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
.field_index = SRC_FIELD_IPV4,
.input_index = SRC_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
.field_index = SRC_FIELD_IPV4,
.input_index = SRC_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
- offsetof(struct ipv4_hdr, src_addr),
+ offsetof(struct
rte_
ipv4_hdr, src_addr),
},
/* next input field (IPv4 destination address) - 4 consecutive bytes. */
{
},
/* next input field (IPv4 destination address) - 4 consecutive bytes. */
{
@@
-119,7
+119,7
@@
static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
.field_index = DST_FIELD_IPV4,
.input_index = DST_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
.field_index = DST_FIELD_IPV4,
.input_index = DST_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
- offsetof(struct ipv4_hdr, dst_addr),
+ offsetof(struct
rte_
ipv4_hdr, dst_addr),
},
/*
* Next 2 fields (src & dst ports) form 4 consecutive bytes.
},
/*
* Next 2 fields (src & dst ports) form 4 consecutive bytes.
@@
-132,8
+132,8
@@
static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
.field_index = SRCP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
.field_index = SRCP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
- sizeof(struct ipv4_hdr) +
- offsetof(struct tcp_hdr, src_port),
+ sizeof(struct
rte_
ipv4_hdr) +
+ offsetof(struct
rte_
tcp_hdr, src_port),
},
{
/* rte_flow uses a bit mask for protocol ports */
},
{
/* rte_flow uses a bit mask for protocol ports */
@@
-142,8
+142,8
@@
static struct rte_acl_field_def ipv4_defs[NUM_FIELDS_IPV4] = {
.field_index = DSTP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
.field_index = DSTP_FIELD_IPV4,
.input_index = SRCP_DESTP_INPUT_IPV4,
.offset = sizeof(struct rte_ether_hdr) +
- sizeof(struct ipv4_hdr) +
- offsetof(struct tcp_hdr, dst_port),
+ sizeof(struct
rte_
ipv4_hdr) +
+ offsetof(struct
rte_
tcp_hdr, dst_port),
},
};
},
};
@@
-379,7
+379,7
@@
parse_ipv4_net(char *in, uint32_t *addr, uint32_t *mask_len)
if (get_cb_field(&in, &m, 0, sizeof(uint32_t) * CHAR_BIT, 0))
return -EINVAL;
if (get_cb_field(&in, &m, 0, sizeof(uint32_t) * CHAR_BIT, 0))
return -EINVAL;
- addr[0] =
IPv
4(a, b, c, d);
+ addr[0] =
RTE_IPV
4(a, b, c, d);
mask_len[0] = m;
return 0;
}
mask_len[0] = m;
return 0;
}