Message ID | 1527128037-63000-1-git-send-email-dlu998@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev,v4,1/2] netdev-native-tnl: Fix alignment for erspan index. | expand |
On Wed, May 23, 2018 at 7:13 PM, Darrell Ball <dlu998@gmail.com> wrote: > Flagged by clang. > > CC: William Tu <u9012063@gmail.com> > Fixes: 068794b43f0e ("erspan: Add flow-based erspan options") > Signed-off-by: Darrell Ball <dlu998@gmail.com> > --- LGTM, thanks Acked-by: William Tu <u9012063@gmail.com>
On Thu, May 24, 2018 at 05:55:00AM -0700, William Tu wrote: > On Wed, May 23, 2018 at 7:13 PM, Darrell Ball <dlu998@gmail.com> wrote: > > Flagged by clang. > > > > CC: William Tu <u9012063@gmail.com> > > Fixes: 068794b43f0e ("erspan: Add flow-based erspan options") > > Signed-off-by: Darrell Ball <dlu998@gmail.com> > > --- > LGTM, thanks > Acked-by: William Tu <u9012063@gmail.com> Thanks Darrell (and William). I applied this to master.
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) {
Flagged by clang. CC: William Tu <u9012063@gmail.com> Fixes: 068794b43f0e ("erspan: Add flow-based erspan options") Signed-off-by: Darrell Ball <dlu998@gmail.com> --- lib/netdev-native-tnl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)