On Thu, May 17, 2018 at 02:15:20PM -0700, Greg Rose wrote:
> Add handlers for OVS_VPORT_TYPE_IP6GRE
> 
> Signed-off-by: Greg Rose <gvrose8...@gmail.com>

I suggest folding in the following incremental:

--8<--------------------------cut here-------------------------->8--

diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
index eea5997026b4..c70811eaff21 100644
--- a/lib/netdev-native-tnl.c
+++ b/lib/netdev-native-tnl.c
@@ -513,10 +513,11 @@ netdev_gre_build_header(const struct netdev *netdev,
     hlen = (uint8_t *) options - (uint8_t *) greh;
 
     data->header_len += hlen;
-    if (!params->is_ipv6)
+    if (!params->is_ipv6) {
         data->tnl_type = OVS_VPORT_TYPE_GRE;
-    else
+    } else {
         data->tnl_type = OVS_VPORT_TYPE_IP6GRE;
+    }
     return 0;
 }
 
@@ -555,7 +556,7 @@ netdev_erspan_pop_header(struct dp_packet *packet)
     }
 
     ersh = ERSPAN_HDR(greh);
-    tnl->tun_id = be32_to_be64(be16_to_be32(htons(get_sid(ersh))));
+    tnl->tun_id = be16_to_be64(htons(get_sid(ersh)));
     tnl->erspan_ver = ersh->ver;
 
     if (ersh->ver == 1) {
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to