X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip_types.c;h=9659ca503b47fdad7996a08d61e8fc0bbf265f8e;hb=297d288ed653abac9d719013c4ead5215230e7da;hp=83228da3330aa46750dfa1941c3e00c95453a3e6;hpb=b9250a9eee1dc259f11bdb9bb8c881da56b52895;p=vpp.git

diff --git a/src/vnet/ip/ip_types.c b/src/vnet/ip/ip_types.c
index 83228da3330..9659ca503b4 100644
--- a/src/vnet/ip/ip_types.c
+++ b/src/vnet/ip/ip_types.c
@@ -173,21 +173,17 @@ ip_address_set (ip_address_t * dst, const void *src, u8 version)
 fib_protocol_t
 ip_address_to_46 (const ip_address_t * addr, ip46_address_t * a)
 {
-  fib_protocol_t proto;
+  fib_protocol_t proto = FIB_PROTOCOL_IP4;
 
-  proto = (AF_IP4 == ip_addr_version (addr) ?
-	   FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6);
-  switch (proto)
+  switch (ip_addr_version (addr))
     {
-    case FIB_PROTOCOL_IP4:
+    case AF_IP4:
       ip46_address_set_ip4 (a, &addr->ip.v4);
       break;
-    case FIB_PROTOCOL_IP6:
+    case AF_IP6:
+      proto = FIB_PROTOCOL_IP6;
       a->ip6 = addr->ip.v6;
       break;
-    default:
-      ASSERT (0);
-      break;
     }
 
   return (proto);