From: vivek <vivek@cumulusnetworks.com>
Date: Sat, 10 Mar 2018 04:14:17 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
X-Git-Tag: frr-5.0-dev~155^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7d39cd191c885608731a82a2cedf2b8953d3bf1c;p=matthieu%2Ffrr.git

Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display

Conflicts:
	bgpd/bgp_attr.c
---

7d39cd191c885608731a82a2cedf2b8953d3bf1c
diff --cc bgpd/bgp_attr.c
index 73256046f6,c23950799f..c3a1105995
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@@ -3311,9 -3263,11 +3311,11 @@@ bgp_size_t bgp_packet_attribute(struct 
  		stream_putc(s, BGP_ATTR_PMSI_TUNNEL);
  		stream_putc(s, 9); // Length
  		stream_putc(s, 0); // Flags
 -		stream_putc(s, 6); // Tunnel type: Ingress Replication (6)
 +		stream_putc(s, PMSI_TNLTYPE_INGR_REPL); // IR (6)
- 		stream_put(s, &(attr->label), BGP_LABEL_BYTES); // MPLS Label / VXLAN VNI
- 		stream_put_ipv4(s, attr->nexthop.s_addr); // Unicast tunnel endpoint IP address
+ 		stream_put(s, &(attr->label),
+ 			   BGP_LABEL_BYTES); // MPLS Label / VXLAN VNI
+ 		stream_put_ipv4(s, attr->nexthop.s_addr);
+ 		// Unicast tunnel endpoint IP address
  	}
  
  	/* Unknown transit attribute. */