From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 13 Jan 2017 19:32:02 +0000 (-0500)
Subject: bgpd: Remove missed HAVE_IPV6
X-Git-Tag: frr-3.0-branchpoint~87^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=386ea4d526de953f3648dfa286f77e5b0a8eef12;p=matthieu%2Ffrr.git

bgpd: Remove missed HAVE_IPV6

Not sure how I missed this :(

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index af3c0486e5..9e1b4392c9 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -1302,7 +1302,6 @@ bgp_open_capability (struct stream *s, struct peer *peer)
       stream_putc (s, 0);
       stream_putc (s, SAFI_ENCAP);
     }
-#ifdef HAVE_IPV6
   /* Currently supporting RFC-5549 for Link-Local peering only */
   if (CHECK_FLAG (peer->flags, PEER_FLAG_CAPABILITY_ENHE) &&
       peer->su.sa.sa_family == AF_INET6 &&
@@ -1371,7 +1370,6 @@ bgp_open_capability (struct stream *s, struct peer *peer)
       stream_putc (s, 0);
       stream_putc (s, SAFI_ENCAP);
     }
-#endif /* HAVE_IPV6 */
 
   /* Route refresh. */
   SET_FLAG (peer->cap, PEER_CAP_REFRESH_ADV);