--- embedaddon/quagga/ospfd/ospf_te.c	2012/02/21 17:26:12	1.1
+++ embedaddon/quagga/ospfd/ospf_te.c	2016/11/02 10:09:12	1.1.1.3
@@ -26,11 +26,6 @@
 
 #include <zebra.h>
 
-#ifdef HAVE_OSPF_TE
-#ifndef HAVE_OPAQUE_LSA
-#error "Wrong configure option"
-#endif /* HAVE_OPAQUE_LSA */
-
 #include "linklist.h"
 #include "prefix.h"
 #include "if.h"
@@ -205,7 +200,7 @@ get_mpls_te_instance_value (void)
 {
   static u_int32_t seqno = 0;
 
-  if (LEGAL_TE_INSTANCE_RANGE (seqno + 1))
+  if (seqno < MAX_LEGAL_TE_INSTANCE_NUM )
     seqno += 1;
   else
     seqno  = 1; /* Avoid zero. */
@@ -556,7 +551,7 @@ ospf_mpls_te_new_if (struct interface *ifp)
 
   if (lookup_linkparams_by_ifp (ifp) != NULL)
     {
-      zlog_warn ("ospf_mpls_te_new_if: ifp(%p) already in use?", ifp);
+      zlog_warn ("ospf_mpls_te_new_if: ifp(%p) already in use?", (void *)ifp);
       rc = 0; /* Do nothing here. */
       goto out;
     }
@@ -1036,7 +1031,8 @@ ospf_mpls_te_lsa_refresh (struct ospf_lsa *lsa)
   /* If the lsa's age reached to MaxAge, start flushing procedure. */
   if (IS_LSA_MAXAGE (lsa))
     {
-      lp->flags &= ~LPFLG_LSA_ENGAGED;
+      if (lp)
+        lp->flags &= ~LPFLG_LSA_ENGAGED;
       ospf_opaque_lsa_flush_schedule (lsa);
       goto out;
     }
@@ -1906,5 +1902,3 @@ ospf_mpls_te_register_vty (void)
 
   return;
 }
-
-#endif /* HAVE_OSPF_TE */