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
vhost: add packed ring indexes increasing function
[dpdk.git]
/
lib
/
librte_pipeline
/
rte_table_action.c
diff --git
a/lib/librte_pipeline/rte_table_action.c
b/lib/librte_pipeline/rte_table_action.c
index
b3c8603
..
961f006
100644
(file)
--- a/
lib/librte_pipeline/rte_table_action.c
+++ b/
lib/librte_pipeline/rte_table_action.c
@@
-14,6
+14,7
@@
#include <rte_esp.h>
#include <rte_tcp.h>
#include <rte_udp.h>
#include <rte_esp.h>
#include <rte_tcp.h>
#include <rte_udp.h>
+#include <rte_vxlan.h>
#include <rte_cryptodev.h>
#include <rte_cryptodev_pmd.h>
#include <rte_cryptodev.h>
#include <rte_cryptodev_pmd.h>
@@
-401,7
+402,6
@@
pkt_work_tm(struct rte_mbuf *mbuf,
{
struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp];
uint32_t queue_id = data->queue_id |
{
struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp];
uint32_t queue_id = data->queue_id |
- (dscp_entry->tc << 2) |
dscp_entry->tc_queue;
rte_mbuf_sched_set(mbuf, queue_id, dscp_entry->tc,
(uint8_t)dscp_entry->color);
dscp_entry->tc_queue;
rte_mbuf_sched_set(mbuf, queue_id, dscp_entry->tc,
(uint8_t)dscp_entry->color);
@@
-611,8
+611,8
@@
encap_ether_apply(void *data,
{
struct encap_ether_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
{
struct encap_ether_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
- RTE_ETHER_TYPE_IP
v
4 :
- RTE_ETHER_TYPE_IP
v
6;
+ RTE_ETHER_TYPE_IP
V
4 :
+ RTE_ETHER_TYPE_IP
V
6;
/* Ethernet */
rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr);
/* Ethernet */
rte_ether_addr_copy(&p->ether.ether.da, &d->ether.d_addr);
@@
-629,8
+629,8
@@
encap_vlan_apply(void *data,
{
struct encap_vlan_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
{
struct encap_vlan_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
- RTE_ETHER_TYPE_IP
v
4 :
- RTE_ETHER_TYPE_IP
v
6;
+ RTE_ETHER_TYPE_IP
V
4 :
+ RTE_ETHER_TYPE_IP
V
6;
/* Ethernet */
rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr);
/* Ethernet */
rte_ether_addr_copy(&p->vlan.ether.da, &d->ether.d_addr);
@@
-653,8
+653,8
@@
encap_qinq_apply(void *data,
{
struct encap_qinq_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
{
struct encap_qinq_data *d = data;
uint16_t ethertype = (common_cfg->ip_version) ?
- RTE_ETHER_TYPE_IP
v
4 :
- RTE_ETHER_TYPE_IP
v
6;
+ RTE_ETHER_TYPE_IP
V
4 :
+ RTE_ETHER_TYPE_IP
V
6;
/* Ethernet */
rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
/* Ethernet */
rte_ether_addr_copy(&p->qinq.ether.da, &d->ether.d_addr);
@@
-697,7
+697,7
@@
encap_qinq_pppoe_apply(void *data,
d->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp,
p->qinq.cvlan.dei,
p->qinq.cvlan.vid));
d->cvlan.vlan_tci = rte_htons(VLAN(p->qinq.cvlan.pcp,
p->qinq.cvlan.dei,
p->qinq.cvlan.vid));
- d->cvlan.eth_proto = rte_htons(ETHER_TYPE_PPPOE_SESSION);
+ d->cvlan.eth_proto = rte_htons(
RTE_
ETHER_TYPE_PPPOE_SESSION);
/* PPPoE and PPP*/
d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
/* PPPoE and PPP*/
d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
@@
-748,7
+748,7
@@
encap_pppoe_apply(void *data,
/* Ethernet */
rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
/* Ethernet */
rte_ether_addr_copy(&p->pppoe.ether.da, &d->ether.d_addr);
rte_ether_addr_copy(&p->pppoe.ether.sa, &d->ether.s_addr);
- d->ether.ether_type = rte_htons(ETHER_TYPE_PPPOE_SESSION);
+ d->ether.ether_type = rte_htons(
RTE_
ETHER_TYPE_PPPOE_SESSION);
/* PPPoE and PPP*/
d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
/* PPPoE and PPP*/
d->pppoe_ppp.ver_type_code = rte_htons(0x1100);
@@
-786,7
+786,7
@@
encap_vxlan_apply(void *data,
d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp,
p->vxlan.vlan.dei,
p->vxlan.vlan.vid));
d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp,
p->vxlan.vlan.dei,
p->vxlan.vlan.vid));
- d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IP
v
4);
+ d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IP
V
4);
/* IPv4*/
d->ipv4.version_ihl = 0x45;
/* IPv4*/
d->ipv4.version_ihl = 0x45;
@@
-821,7
+821,7
@@
encap_vxlan_apply(void *data,
&d->ether.d_addr);
rte_ether_addr_copy(&p->vxlan.ether.sa,
&d->ether.s_addr);
&d->ether.d_addr);
rte_ether_addr_copy(&p->vxlan.ether.sa,
&d->ether.s_addr);
- d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IP
v
4);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IP
V
4);
/* IPv4*/
d->ipv4.version_ihl = 0x45;
/* IPv4*/
d->ipv4.version_ihl = 0x45;
@@
-864,7
+864,7
@@
encap_vxlan_apply(void *data,
d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp,
p->vxlan.vlan.dei,
p->vxlan.vlan.vid));
d->vlan.vlan_tci = rte_htons(VLAN(p->vxlan.vlan.pcp,
p->vxlan.vlan.dei,
p->vxlan.vlan.vid));
- d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IP
v
6);
+ d->vlan.eth_proto = rte_htons(RTE_ETHER_TYPE_IP
V
6);
/* IPv6*/
d->ipv6.vtc_flow = rte_htonl((6 << 28) |
/* IPv6*/
d->ipv6.vtc_flow = rte_htonl((6 << 28) |
@@
-899,7
+899,7
@@
encap_vxlan_apply(void *data,
&d->ether.d_addr);
rte_ether_addr_copy(&p->vxlan.ether.sa,
&d->ether.s_addr);
&d->ether.d_addr);
rte_ether_addr_copy(&p->vxlan.ether.sa,
&d->ether.s_addr);
- d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IP
v
6);
+ d->ether.ether_type = rte_htons(RTE_ETHER_TYPE_IP
V
6);
/* IPv6*/
d->ipv6.vtc_flow = rte_htonl((6 << 28) |
/* IPv6*/
d->ipv6.vtc_flow = rte_htonl((6 << 28) |