diff mbox

[ovs-dev,v3,4/6] userspace: add NSH support to vxlan-gpe tunnels

Message ID 1501722900-7158-5-git-send-email-yi.y.yang@intel.com
State Changes Requested
Headers show

Commit Message

Yang, Yi Aug. 3, 2017, 1:14 a.m. UTC 
From: Jan Scheurich <jan.scheurich@ericsson.com>

Signed-off-by: Yi Yang <yi.y.yang@intel.com>
Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>
---
 lib/netdev-native-tnl.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Ben Pfaff Aug. 4, 2017, 8:13 p.m. UTC | #1 
On Thu, Aug 03, 2017 at 09:14:58AM +0800, Yi Yang wrote:
> From: Jan Scheurich <jan.scheurich@ericsson.com>
> 
> Signed-off-by: Yi Yang <yi.y.yang@intel.com>
> Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>

Looks good to me, but are there any tests?  (Do the later patches test
this support?)
Yang, Yi Aug. 5, 2017, 5:52 a.m. UTC | #2 
Patch 5 in v4 (patch 6 in v3) has covered this.

-----Original Message-----
From: Ben Pfaff [mailto:blp@ovn.org] 
Sent: Saturday, August 5, 2017 4:13 AM
To: Yang, Yi Y <yi.y.yang@intel.com>
Cc: dev@openvswitch.org; Jan Scheurich <jan.scheurich@ericsson.com>
Subject: Re: [PATCH v3 4/6] userspace: add NSH support to vxlan-gpe tunnels

On Thu, Aug 03, 2017 at 09:14:58AM +0800, Yi Yang wrote:
> From: Jan Scheurich <jan.scheurich@ericsson.com>
> 
> Signed-off-by: Yi Yang <yi.y.yang@intel.com>
> Signed-off-by: Jan Scheurich <jan.scheurich@ericsson.com>

Looks good to me, but are there any tests?  (Do the later patches test this support?)
diff mbox

Patch

diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c
index ef57940..3264810 100644
--- 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;