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
net/txgbe: add multi-speed link setup
[dpdk.git]
/
drivers
/
net
/
ixgbe
/
ixgbe_flow.c
diff --git
a/drivers/net/ixgbe/ixgbe_flow.c
b/drivers/net/ixgbe/ixgbe_flow.c
index
23aba0a
..
6b3dea4
100644
(file)
--- a/
drivers/net/ixgbe/ixgbe_flow.c
+++ b/
drivers/net/ixgbe/ixgbe_flow.c
@@
-215,7
+215,7
@@
cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
memset(ð_null, 0, sizeof(struct rte_flow_item_eth));
memset(&vlan_null, 0, sizeof(struct rte_flow_item_vlan));
memset(ð_null, 0, sizeof(struct rte_flow_item_eth));
memset(&vlan_null, 0, sizeof(struct rte_flow_item_vlan));
-#ifdef RTE_LIB
RTE
_SECURITY
+#ifdef RTE_LIB_SECURITY
/**
* Special case for flow action type RTE_FLOW_ACTION_TYPE_SECURITY
*/
/**
* Special case for flow action type RTE_FLOW_ACTION_TYPE_SECURITY
*/
@@
-629,7
+629,7
@@
ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
if (ret)
return ret;
-#ifdef RTE_LIB
RTE
_SECURITY
+#ifdef RTE_LIB_SECURITY
/* ESP flow not really a flow*/
if (filter->proto == IPPROTO_ESP)
return 0;
/* ESP flow not really a flow*/
if (filter->proto == IPPROTO_ESP)
return 0;
@@
-887,8
+887,8
@@
ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
return -rte_errno;
}
return -rte_errno;
}
- if (filter->ether_type == RTE_ETHER_TYPE_IP
v
4 ||
- filter->ether_type == RTE_ETHER_TYPE_IP
v
6) {
+ if (filter->ether_type == RTE_ETHER_TYPE_IP
V
4 ||
+ filter->ether_type == RTE_ETHER_TYPE_IP
V
6) {
memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
@@
-1048,13
+1048,13
@@
cons_parse_syn_filter(const struct rte_flow_attr *attr,
tcp_spec = item->spec;
tcp_mask = item->mask;
tcp_spec = item->spec;
tcp_mask = item->mask;
- if (!(tcp_spec->hdr.tcp_flags & TCP_SYN_FLAG) ||
+ if (!(tcp_spec->hdr.tcp_flags &
RTE_
TCP_SYN_FLAG) ||
tcp_mask->hdr.src_port ||
tcp_mask->hdr.dst_port ||
tcp_mask->hdr.sent_seq ||
tcp_mask->hdr.recv_ack ||
tcp_mask->hdr.data_off ||
tcp_mask->hdr.src_port ||
tcp_mask->hdr.dst_port ||
tcp_mask->hdr.sent_seq ||
tcp_mask->hdr.recv_ack ||
tcp_mask->hdr.data_off ||
- tcp_mask->hdr.tcp_flags != TCP_SYN_FLAG ||
+ tcp_mask->hdr.tcp_flags !=
RTE_
TCP_SYN_FLAG ||
tcp_mask->hdr.rx_win ||
tcp_mask->hdr.cksum ||
tcp_mask->hdr.tcp_urp) {
tcp_mask->hdr.rx_win ||
tcp_mask->hdr.cksum ||
tcp_mask->hdr.tcp_urp) {
@@
-2874,7
+2874,7
@@
ixgbe_parse_rss_filter(struct rte_eth_dev *dev,
/* check if the next not void item is END */
act = next_no_void_action(actions, act);
if (act->type != RTE_FLOW_ACTION_TYPE_END) {
/* check if the next not void item is END */
act = next_no_void_action(actions, act);
if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- memset(rss_conf, 0, sizeof(struct
rte_eth
_rss_conf));
+ memset(rss_conf, 0, sizeof(struct
ixgbe_rte_flow
_rss_conf));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION,
act, "Not supported action.");
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION,
act, "Not supported action.");
@@
-3057,7
+3057,7
@@
ixgbe_flow_create(struct rte_eth_dev *dev,
ret = ixgbe_parse_ntuple_filter(dev, attr, pattern,
actions, &ntuple_filter, error);
ret = ixgbe_parse_ntuple_filter(dev, attr, pattern,
actions, &ntuple_filter, error);
-#ifdef RTE_LIB
RTE
_SECURITY
+#ifdef RTE_LIB_SECURITY
/* ESP flow not really a flow*/
if (ntuple_filter.proto == IPPROTO_ESP)
return flow;
/* ESP flow not really a flow*/
if (ntuple_filter.proto == IPPROTO_ESP)
return flow;