Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
devices: Add queues params in create_if
[vpp.git]
/
src
/
vnet
/
devices
/
af_packet
/
node.c
diff --git
a/src/vnet/devices/af_packet/node.c
b/src/vnet/devices/af_packet/node.c
index
f4db639
..
caddcfa
100644
(file)
--- a/
src/vnet/devices/af_packet/node.c
+++ b/
src/vnet/devices/af_packet/node.c
@@
-120,6
+120,7
@@
static_always_inline void
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
{
ethernet_header_t *eth = vlib_buffer_get_current (b);
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
{
ethernet_header_t *eth = vlib_buffer_get_current (b);
+ vnet_buffer_oflags_t oflags = 0;
if (clib_net_to_host_u16 (eth->type) == ETHERNET_TYPE_IP4)
{
ip4_header_t *ip4 =
if (clib_net_to_host_u16 (eth->type) == ETHERNET_TYPE_IP4)
{
ip4_header_t *ip4 =
@@
-127,7
+128,7
@@
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
b->flags |= VNET_BUFFER_F_IS_IP4;
if (ip4->protocol == IP_PROTOCOL_TCP)
{
b->flags |= VNET_BUFFER_F_IS_IP4;
if (ip4->protocol == IP_PROTOCOL_TCP)
{
-
b->flags |= VNET_BUFFER_F_OFFLOAD
_TCP_CKSUM;
+
oflags |= VNET_BUFFER_OFFLOAD_F
_TCP_CKSUM;
tcp_header_t *tcp = (tcp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) +
ip4_header_bytes (ip4));
tcp_header_t *tcp = (tcp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) +
ip4_header_bytes (ip4));
@@
-136,7
+137,7
@@
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
}
else if (ip4->protocol == IP_PROTOCOL_UDP)
{
}
else if (ip4->protocol == IP_PROTOCOL_UDP)
{
-
b->flags |= VNET_BUFFER_F_OFFLOAD
_UDP_CKSUM;
+
oflags |= VNET_BUFFER_OFFLOAD_F
_UDP_CKSUM;
udp_header_t *udp = (udp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) +
ip4_header_bytes (ip4));
udp_header_t *udp = (udp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) +
ip4_header_bytes (ip4));
@@
-146,6
+147,8
@@
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
vnet_buffer (b)->l3_hdr_offset = sizeof (ethernet_header_t);
vnet_buffer (b)->l4_hdr_offset =
sizeof (ethernet_header_t) + ip4_header_bytes (ip4);
vnet_buffer (b)->l3_hdr_offset = sizeof (ethernet_header_t);
vnet_buffer (b)->l4_hdr_offset =
sizeof (ethernet_header_t) + ip4_header_bytes (ip4);
+ if (oflags)
+ vnet_buffer_offload_flags_set (b, oflags);
}
else if (clib_net_to_host_u16 (eth->type) == ETHERNET_TYPE_IP6)
{
}
else if (clib_net_to_host_u16 (eth->type) == ETHERNET_TYPE_IP6)
{
@@
-165,7
+168,7
@@
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
}
if (ip6->protocol == IP_PROTOCOL_TCP)
{
}
if (ip6->protocol == IP_PROTOCOL_TCP)
{
-
b->flags |= VNET_BUFFER_F_OFFLOAD
_TCP_CKSUM;
+
oflags |= VNET_BUFFER_OFFLOAD_F
_TCP_CKSUM;
tcp_header_t *tcp =
(tcp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) + ip6_hdr_len);
tcp_header_t *tcp =
(tcp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) + ip6_hdr_len);
@@
-174,7
+177,7
@@
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
}
else if (ip6->protocol == IP_PROTOCOL_UDP)
{
}
else if (ip6->protocol == IP_PROTOCOL_UDP)
{
-
b->flags |= VNET_BUFFER_F_OFFLOAD
_UDP_CKSUM;
+
oflags |= VNET_BUFFER_OFFLOAD_F
_UDP_CKSUM;
udp_header_t *udp =
(udp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) + ip6_hdr_len);
udp_header_t *udp =
(udp_header_t *) (vlib_buffer_get_current (b) +
sizeof (ethernet_header_t) + ip6_hdr_len);
@@
-184,6
+187,8
@@
mark_tcp_udp_cksum_calc (vlib_buffer_t *b, u8 *l4_hdr_sz)
vnet_buffer (b)->l3_hdr_offset = sizeof (ethernet_header_t);
vnet_buffer (b)->l4_hdr_offset =
sizeof (ethernet_header_t) + ip6_hdr_len;
vnet_buffer (b)->l3_hdr_offset = sizeof (ethernet_header_t);
vnet_buffer (b)->l4_hdr_offset =
sizeof (ethernet_header_t) + ip6_hdr_len;
+ if (oflags)
+ vnet_buffer_offload_flags_set (b, oflags);
}
}
}
}
@@
-327,7
+332,6
@@
af_packet_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
}
/* trace */
}
/* trace */
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0);
if (PREDICT_FALSE
(n_trace > 0 && vlib_trace_buffer (vm, node, next0, first_b0,
/* follow_chain */ 0)))
if (PREDICT_FALSE
(n_trace > 0 && vlib_trace_buffer (vm, node, next0, first_b0,
/* follow_chain */ 0)))
@@
-383,7
+387,6
@@
VLIB_NODE_FN (af_packet_input_node) (vlib_main_t * vm,
return n_rx_packets;
}
return n_rx_packets;
}
-/* *INDENT-OFF* */
VLIB_REGISTER_NODE (af_packet_input_node) = {
.name = "af-packet-input",
.flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
VLIB_REGISTER_NODE (af_packet_input_node) = {
.name = "af-packet-input",
.flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
@@
-394,7
+397,6
@@
VLIB_REGISTER_NODE (af_packet_input_node) = {
.n_errors = AF_PACKET_INPUT_N_ERROR,
.error_strings = af_packet_input_error_strings,
};
.n_errors = AF_PACKET_INPUT_N_ERROR,
.error_strings = af_packet_input_error_strings,
};
-/* *INDENT-ON* */
/*
/*