summaryrefslogtreecommitdiffstats
path: root/ospfd/ospf_lsa.c
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-05-29 22:54:24 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-05-29 22:54:24 -0700
commitb25e631dcc357f16d05fb2ac4f1570d7e86ec0ef (patch)
treee49268da6abb834c02049ac982b364e991aecb2e /ospfd/ospf_lsa.c
parentb2d49f178cc69c580039c5fb058f6eba4a542b1f (diff)
parent97dd2bf9bb517c428cfa2778cac071ad845d03a1 (diff)
downloadquagga-b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef.tar.bz2
quagga-b25e631dcc357f16d05fb2ac4f1570d7e86ec0ef.tar.xz
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-quagga into hollywood
Diffstat (limited to 'ospfd/ospf_lsa.c')
-rw-r--r--ospfd/ospf_lsa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 243928f4..0d205ee3 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -526,7 +526,7 @@ link_info_set (struct stream *s, struct in_addr id,
if (ret == OSPF_MAX_LSA_SIZE)
{
- zlog_warn ("%s: Out of space in LSA stream, left %ld, size %ld",
+ zlog_warn ("%s: Out of space in LSA stream, left %ld, size %z",
__func__, STREAM_REMAIN (s), STREAM_SIZE (s));
return 0;
}
@@ -1895,6 +1895,7 @@ ospf_lsa_translated_nssa_new (struct ospf *ospf,
return new;
}
+#if 0
/* compare type-5 to type-7
* -1: err, 0: same, 1: different
*/
@@ -1931,6 +1932,7 @@ ospf_lsa_translated_nssa_compare (struct ospf_lsa *t7, struct ospf_lsa *t5)
return LSA_REFRESH_IF_CHANGED;
}
+#endif
/* Originate Translated Type-5 for supplied Type-7 NSSA LSA */
struct ospf_lsa *