X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fsrv6-mobile%2Fnode.c;h=6eafefd3f5b2c31d27cb01f36373bba680dd6ff1;hb=79bfd2725;hp=08357bb1b0e996d3e866ed46ee2bd256daeb486c;hpb=221b3839b197ea1a0d155dd4b635d4fa3d8123b6;p=vpp.git

diff --git a/src/plugins/srv6-mobile/node.c b/src/plugins/srv6-mobile/node.c
index 08357bb1b0e..6eafefd3f5b 100644
--- a/src/plugins/srv6-mobile/node.c
+++ b/src/plugins/srv6-mobile/node.c
@@ -372,8 +372,8 @@ VLIB_NODE_FN (srv6_end_m_gtp4_e) (vlib_main_t * vm,
 
 	      len0 = vlib_buffer_length_in_chain (vm, b0);
 
-	      offset = ls0->localsid_len / 8;
-	      shift = ls0->localsid_len % 8;
+	      offset = ls0->localsid_prefix_len / 8;
+	      shift = ls0->localsid_prefix_len % 8;
 
 	      gtpu_type = gtpu_type_get (tag);
 
@@ -939,12 +939,12 @@ VLIB_NODE_FN (srv6_t_m_gtp4_d) (vlib_main_t * vm,
 			}
 		      else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
 			{
-			  ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+			  ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 			}
 		    }
 		  else
 		    {
-		      ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+		      ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 		    }
 		}
 	      else
@@ -958,7 +958,7 @@ VLIB_NODE_FN (srv6_t_m_gtp4_d) (vlib_main_t * vm,
 		    {
 		      ip6srv->ip.protocol = IP_PROTOCOL_IPV6_ROUTE;
 
-		      ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+		      ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 
 		      ip6srv->sr.tag =
 			clib_host_to_net_u16 (srh_tagfield[gtpu_type]);
@@ -1008,7 +1008,7 @@ VLIB_NODE_FN (srv6_t_m_gtp4_d) (vlib_main_t * vm,
 			}
 		      else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
 			{
-			  ip6srv->ip.protocol = IP_PROTOCOL_NONE;
+			  ip6srv->ip.protocol = IP_PROTOCOL_IP6_ETHERNET;
 			}
 		    }
 		}
@@ -1169,7 +1169,7 @@ VLIB_NODE_FN (srv6_end_m_gtp6_e) (vlib_main_t * vm,
 	      u16 offset, shift;
 	      u32 hdrlen = 0;
 
-	      index = ls0->localsid_len;
+	      index = ls0->localsid_prefix_len;
 	      index += 8;
 	      offset = index / 8;
 	      shift = index % 8;
@@ -1680,12 +1680,12 @@ VLIB_NODE_FN (srv6_end_m_gtp6_d) (vlib_main_t * vm,
 			}
 		      else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
 			{
-			  ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+			  ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 			}
 		    }
 		  else
 		    {
-		      ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+		      ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 		    }
 		}
 	      else
@@ -1700,7 +1700,7 @@ VLIB_NODE_FN (srv6_end_m_gtp6_d) (vlib_main_t * vm,
 		    {
 		      ip6srv->ip.protocol = IP_PROTOCOL_IPV6_ROUTE;
 
-		      ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+		      ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 
 		      ip6srv->sr.tag =
 			clib_host_to_net_u16 (srh_tagfield[gtpu_type]);
@@ -1748,7 +1748,7 @@ VLIB_NODE_FN (srv6_end_m_gtp6_d) (vlib_main_t * vm,
 			}
 		      else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
 			{
-			  ip6srv->ip.protocol = IP_PROTOCOL_NONE;
+			  ip6srv->ip.protocol = IP_PROTOCOL_IP6_ETHERNET;
 			}
 		    }
 		}
@@ -2152,12 +2152,12 @@ VLIB_NODE_FN (srv6_end_m_gtp6_d_di) (vlib_main_t * vm,
 		    }
 		  else if (ls_param->nhtype == SRV6_NHTYPE_NON_IP)
 		    {
-		      ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+		      ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 		    }
 		}
 	      else
 		{
-		  ip6srv->sr.protocol = IP_PROTOCOL_NONE;
+		  ip6srv->sr.protocol = IP_PROTOCOL_IP6_ETHERNET;
 		}
 
 	      good_n++;