Merge remote-tracking branch 'origin/master' into pim_lib_work2

1 files changed, 0 insertions, 6 deletions

diff --git a/lib/bfd.c b/lib/bfd.c
index a498daf762..5db08fea60 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -179,11 +179,9 @@ bfd_peer_sendmsg (struct zclient *zclient, struct bfd_info *bfd_info,
     case AF_INET:
       stream_put_in_addr (s, (struct in_addr *)dst_ip);
       break;
-#ifdef HAVE_IPV6
     case AF_INET6:
       stream_put(s, dst_ip, 16);
       break;
-#endif
     default:
       break;
     }
@@ -207,11 +205,9 @@ bfd_peer_sendmsg (struct zclient *zclient, struct bfd_info *bfd_info,
             case AF_INET:
               stream_put_in_addr (s, (struct in_addr *) src_ip);
               break;
-        #ifdef HAVE_IPV6
             case AF_INET6:
               stream_put(s, src_ip, 16);
               break;
-        #endif
             default:
               break;
             }
@@ -221,13 +217,11 @@ bfd_peer_sendmsg (struct zclient *zclient, struct bfd_info *bfd_info,
   else
     {
       stream_putc(s, 0);
-#ifdef HAVE_IPV6
       if ((family == AF_INET6) && (src_ip))
         {
           stream_putw(s, family);
           stream_put(s, src_ip, 16);
         }
-#endif
       if (if_name)
         {
           len = strlen(if_name);