]> git.puffer.fish Git - matthieu/frr.git/commitdiff
bgpd: Do not force nh_afi to be AFI_IP for 'ipv4 labeled-unicast'
authorDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 25 Apr 2017 21:53:28 +0000 (21:53 +0000)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 26 Apr 2017 17:57:08 +0000 (13:57 -0400)
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
bgpd/bgp_attr.c

index 7a28da5780a553339e0edb65c711e5d7dc8b3218..6f4e797a94077590b862cffe093bbc2cea7d8c43 100644 (file)
@@ -2793,9 +2793,6 @@ bgp_packet_mpattr_start (struct stream *s, afi_t afi, safi_t safi, afi_t nh_afi,
   if (nh_afi == AFI_MAX)
     nh_afi = BGP_NEXTHOP_AFI_FROM_NHLEN(attr->extra->mp_nexthop_len);
 
-  if (safi == SAFI_LABELED_UNICAST)
-    nh_afi = AFI_IP;
-
   /* Nexthop */
   switch (nh_afi)
     {