Merge pull request #5468 from qlyoung/bgpd-remove-bgp-attr-dup

[mirror_frr.git] / ospfd / ospf_ism.c

diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index ad9b3efe6ee7f1d17d410751f7395004c858fe03..e394b6f472b4f58f2d4439a46c817a269b9245bb 100644 (file)
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -277,7 +277,7 @@ static int ospf_wait_timer(struct thread *thread)
        return 0;
 }
 
-/* Hook function called after ospf ISM event is occured. And vty's
+/* Hook function called after ospf ISM event is occurred. And vty's
    network command invoke this function after making interface
    structure. */
 static void ism_timer_set(struct ospf_interface *oi)
@@ -380,12 +380,10 @@ static int ism_interface_up(struct ospf_interface *oi)
 
 static int ism_loop_ind(struct ospf_interface *oi)
 {
-       int ret = 0;
-
        /* call ism_interface_down. */
        /* ret = ism_interface_down (oi); */
 
-       return ret;
+       return 0;
 }
 
 /* Interface down event handler. */
@@ -420,7 +418,7 @@ static int ism_ignore(struct ospf_interface *oi)
 }
 
 /* Interface State Machine */
-struct {
+const struct {
        int (*func)(struct ospf_interface *);
        int next_state;
 } ISM[OSPF_ISM_STATE_MAX][OSPF_ISM_EVENT_MAX] = {
@@ -514,7 +512,7 @@ struct {
        },
 };
 
-static const char *ospf_ism_event_str[] = {
+static const char *const ospf_ism_event_str[] = {
        "NoEvent",      "InterfaceUp", "WaitTimer", "BackupSeen",
        "NeighborChange", "LoopInd",     "UnLoopInd", "InterfaceDown",
 };