diff options
| author |   Hongjun Ni <hongjun.ni@intel.com> | 2016-05-02 10:56:48 -0700 |
|---|---|---|
| committer |   Keith Burns <alagalah@gmail.com> | 2016-05-03 02:07:03 +0000 |
| commit | d91b22fd6c8287158d0f6344eef59cf2f8d6fb88 (patch) | |
| tree | 68a213cb93758c84f4f940fa6b770549c1cc6526 | |
| parent | c7e91e44518e708ea70b37f11d65428b38640edf (diff) | |
VPP-15 Add ethernet support for nsh-gre's decap-next
Change-Id: Icf3424671b4aa0f619983a3eb61785b533fdc11d
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
| -rw-r--r-- | vnet/vnet/nsh-gre/nsh_gre.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vnet/vnet/nsh-gre/nsh_gre.c b/vnet/vnet/nsh-gre/nsh_gre.c index 7f773e6440e..ee968a3f145 100644 --- a/vnet/vnet/nsh-gre/nsh_gre.c +++ b/vnet/vnet/nsh-gre/nsh_gre.c @@ -34,6 +34,8 @@ static u8 * format_decap_next (u8 * s, va_list * args) return format (s, "ip4"); case NSH_INPUT_NEXT_IP6_INPUT: return format (s, "ip6"); + case NSH_INPUT_NEXT_ETHERNET_INPUT: + return format (s, "ethernet"); default: return format (s, "index %d", next_index); } @@ -338,7 +340,7 @@ static uword unformat_decap_next (unformat_input_t * input, va_list * args) else if (unformat (input, "ip6")) *result = NSH_INPUT_NEXT_IP6_INPUT; else if (unformat (input, "ethernet")) - *result = NSH_INPUT_NEXT_IP6_INPUT; + *result = NSH_INPUT_NEXT_ETHERNET_INPUT; else if (unformat (input, "%d", &tmp)) *result = tmp; else |