From: vivek <vivek@cumulusnetworks.com>
Date: Wed, 9 Dec 2015 01:01:20 +0000 (-0800)
Subject: Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
X-Git-Tag: frr-2.0-rc1~1169^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=3d63d59fd1ac70e3bdfc243a40d1cfbc5c547ac6;p=mirror%2Ffrr.git

Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
---

3d63d59fd1ac70e3bdfc243a40d1cfbc5c547ac6
diff --cc zebra/rib.h
index 4d5ccac606,bb2c084c47..285994c015
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@@ -371,16 -370,7 +370,15 @@@ typedef struct rib_tables_iter_t
    rib_tables_iter_state_t state;
  } rib_tables_iter_t;
  
 +/* Events/reasons triggering a RIB update. */
 +typedef enum
 +{
 +  RIB_UPDATE_IF_CHANGE,
 +  RIB_UPDATE_RMAP_CHANGE,
 +  RIB_UPDATE_OTHER
 +} rib_update_event_t;
 +
  extern struct nexthop *rib_nexthop_ifindex_add (struct rib *, unsigned int);
- extern struct nexthop *rib_nexthop_ifname_add (struct rib *, char *);
  extern struct nexthop *rib_nexthop_blackhole_add (struct rib *);
  extern struct nexthop *rib_nexthop_ipv4_add (struct rib *, struct in_addr *,
  					     struct in_addr *);