userspace: add NSH support to vxlan-gpe tunnels

Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
index ef579409b0d0f11559f6e66ab8fb8480a6479d9c..3264810f39c99627e80a42ef051610755e12fddf 100644 (file)
--- a/lib/netdev-native-tnl.c
+++ b/lib/netdev-native-tnl.c
@@ -531,6 +531,9 @@ netdev_vxlan_pop_header(struct dp_packet *packet)
         case VXLAN_GPE_NP_IPV6:
             next_pt = PT_IPV6;
             break;
+        case VXLAN_GPE_NP_NSH:
+            next_pt = PT_NSH;
+            break;
         case VXLAN_GPE_NP_ETHERNET:
             next_pt = PT_ETH;
             break;
@@ -590,6 +593,9 @@ netdev_vxlan_build_header(const struct netdev *netdev,
             case ETH_TYPE_IPV6:
                 vxh->vx_gpe.next_protocol = VXLAN_GPE_NP_IPV6;
                 break;
+            case ETH_TYPE_NSH:
+                vxh->vx_gpe.next_protocol = VXLAN_GPE_NP_NSH;
+                break;
             case ETH_TYPE_TEB:
                 vxh->vx_gpe.next_protocol = VXLAN_GPE_NP_ETHERNET;
                 break;