summaryrefslogtreecommitdiffstats
path: root/src/vnet/ip/ip4_forward.c
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-04-12 08:31:39 -0400
committerDave Barach <openvpp@barachs.net>2020-04-15 11:00:26 +0000
commit1bd2c019eba5c893d634cc496bd6d54c00020d7e (patch)
tree99595a7f0818e07034a0a9a7b158d4157a98b3ed /src/vnet/ip/ip4_forward.c
parent69eeadc03f30c9fb3fe1bb7e2eeb6b04d1bcc596 (diff)
misc: refactor calc_checksums
Merge two mildly incompatible static inlines, and rename the results vnet_calc_checksums_inline (...). The resulting inline has three additional parameters: int is_ip4, int is_ip6, and int with_gso. All calls manage to pass one or more as compile-time constants, which causes a certain amount of code to disappear in each instantiation. Type: refactor Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: I1a2a0e353b9a7bca20bc81318e8c915617261e1a
Diffstat (limited to 'src/vnet/ip/ip4_forward.c')
-rw-r--r--src/vnet/ip/ip4_forward.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 4ba0a731006..952915f5317 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -2161,7 +2161,9 @@ ip4_rewrite_inline_with_gso (vlib_main_t * vm,
tx_sw_if_index0, &next_index, b[0]);
next[0] = next_index;
if (is_midchain)
- calc_checksums (vm, b[0]);
+ vnet_calc_checksums_inline (vm, b[0], 1 /* is_ip4 */ ,
+ 0 /* is_ip6 */ ,
+ 0 /* with gso */ );
}
else
{
@@ -2183,7 +2185,9 @@ ip4_rewrite_inline_with_gso (vlib_main_t * vm,
tx_sw_if_index1, &next_index, b[1]);
next[1] = next_index;
if (is_midchain)
- calc_checksums (vm, b[1]);
+ vnet_calc_checksums_inline (vm, b[0], 1 /* is_ip4 */ ,
+ 0 /* is_ip6 */ ,
+ 0 /* with gso */ );
}
else
{
@@ -2327,7 +2331,9 @@ ip4_rewrite_inline_with_gso (vlib_main_t * vm,
next[0] = next_index;
if (is_midchain)
- calc_checksums (vm, b[0]);
+ vnet_calc_checksums_inline (vm, b[0], 1 /* is_ip4 */ ,
+ 0 /* is_ip6 */ ,
+ 0 /* with gso */ );
/* Guess we are only writing on simple Ethernet header. */
vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
@@ -2426,7 +2432,9 @@ ip4_rewrite_inline_with_gso (vlib_main_t * vm,
if (is_midchain)
/* this acts on the packet that is about to be encapped */
- calc_checksums (vm, b[0]);
+ vnet_calc_checksums_inline (vm, b[0], 1 /* is_ip4 */ ,
+ 0 /* is_ip6 */ ,
+ 0 /* with gso */ );
/* Guess we are only writing on simple Ethernet header. */
vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));