Revert "bgpd: Make sure default-originate works without route-map as well"

[mirror_frr.git] / bgpd / bgp_mpath.h

diff --git a/bgpd/bgp_mpath.h b/bgpd/bgp_mpath.h
index 628a92068cae816eba87fc9d0c54571e91d25e66..1fa11d3d0ef349f6e7f6110e309b344a0040aa1a 100644 (file)
--- a/bgpd/bgp_mpath.h
+++ b/bgpd/bgp_mpath.h
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with Quagga; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _QUAGGA_BGP_MPATH_H
@@ -37,15 +36,15 @@ struct bgp_info_mpath {
        struct bgp_info *mp_info;
 
        /* When attached to best path, the number of selected multipaths */
-       u_int32_t mp_count;
+       uint32_t mp_count;
 
        /* Aggregated attribute for advertising multipath route */
        struct attr *mp_attr;
 };
 
 /* Functions to support maximum-paths configuration */
-extern int bgp_maximum_paths_set(struct bgp *, afi_t, safi_t, int, u_int16_t,
-                                u_int16_t);
+extern int bgp_maximum_paths_set(struct bgp *, afi_t, safi_t, int, uint16_t,
+                                uint16_t);
 extern int bgp_maximum_paths_unset(struct bgp *, afi_t, safi_t, int);
 
 /* Functions used by bgp_best_selection to record current
@@ -71,7 +70,7 @@ extern struct bgp_info *bgp_info_mpath_first(struct bgp_info *);
 extern struct bgp_info *bgp_info_mpath_next(struct bgp_info *);
 
 /* Accessors for multipath information */
-extern u_int32_t bgp_info_mpath_count(struct bgp_info *);
+extern uint32_t bgp_info_mpath_count(struct bgp_info *);
 extern struct attr *bgp_info_mpath_attr(struct bgp_info *);
 
 #endif /* _QUAGGA_BGP_MPATH_H */