Merge pull request #234 from HRogge/master

[feed/routing.git] / quagga / patches / 120-quagga_manet.patch

diff --git a/quagga/patches/120-quagga_manet.patch b/quagga/patches/120-quagga_manet.patch
index 684a27d162b8828d99225896a0397da14b6c4214..2411bd0df32fcee33cf3e39a1e27e0704351ffaf 100644 (file)
--- a/quagga/patches/120-quagga_manet.patch
+++ b/quagga/patches/120-quagga_manet.patch
@@ -205,7 +205,7 @@
        {
          time_t uptime;
          struct tm *tm;
-@@ -777,7 +780,10 @@ vty_show_ip_route (struct vty *vty, stru
+@@ -784,7 +787,10 @@ vty_show_ip_route (struct vty *vty, stru
          || rib->type == ZEBRA_ROUTE_OSPF
          || rib->type == ZEBRA_ROUTE_BABEL
          || rib->type == ZEBRA_ROUTE_ISIS
@@ -217,7 +217,7 @@
        {
          time_t uptime;
          struct tm *tm;
-@@ -1570,7 +1576,10 @@ vty_show_ipv6_route_detail (struct vty *
+@@ -1577,7 +1583,10 @@ vty_show_ipv6_route_detail (struct vty *
          || rib->type == ZEBRA_ROUTE_OSPF6
          || rib->type == ZEBRA_ROUTE_BABEL
          || rib->type == ZEBRA_ROUTE_ISIS
@@ -229,7 +229,7 @@
        {
          time_t uptime;
          struct tm *tm;
-@@ -1750,7 +1759,10 @@ vty_show_ipv6_route (struct vty *vty, st
+@@ -1757,7 +1766,10 @@ vty_show_ipv6_route (struct vty *vty, st
          || rib->type == ZEBRA_ROUTE_OSPF6
          || rib->type == ZEBRA_ROUTE_BABEL
          || rib->type == ZEBRA_ROUTE_ISIS