Flagged by clang. CC: William Tu <u9012...@gmail.com> Fixes: 068794b43f0e ("erspan: Add flow-based erspan options") Signed-off-by: Darrell Ball <dlu...@gmail.com> --- lib/netdev-native-tnl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index c97491e..a63fe24 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -653,23 +653,16 @@ netdev_erspan_build_header(const struct netdev *netdev, } if (erspan_ver == 1) { - ovs_be32 *index; - greh->protocol = htons(ETH_TYPE_ERSPAN1); greh->flags = htons(GRE_SEQ); ersh->ver = 1; set_sid(ersh, sid); + uint32_t erspan_idx = (tnl_cfg->erspan_idx_flow + ? params->flow->tunnel.erspan_idx + : tnl_cfg->erspan_idx); put_16aligned_be32(ALIGNED_CAST(ovs_16aligned_be32 *, ersh + 1), - htonl(tnl_cfg->erspan_idx)); - - index = (ovs_be32 *)(ersh + 1); - - if (tnl_cfg->erspan_idx_flow) { - *index = htonl(params->flow->tunnel.erspan_idx); - } else { - *index = htonl(tnl_cfg->erspan_idx); - } + htonl(erspan_idx)); hlen = ERSPAN_GREHDR_LEN + sizeof *ersh + ERSPAN_V1_MDSIZE; } else if (erspan_ver == 2) { -- 1.9.1 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev