zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ospfd / ospf_ism.c

diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index d1cdadc40689b5d8e7b0bf8105da6410bb7ad3bd..9fd9a70c78e9e0300eb0cddcebf50c9dac82883c 100644 (file)
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -15,10 +15,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -105,7 +104,7 @@ static struct ospf_neighbor *ospf_elect_dr(struct ospf_interface *oi,
        else
                DR(oi).s_addr = 0;
 
-       list_delete(dr_list);
+       list_delete(&dr_list);
 
        return dr;
 }
@@ -145,8 +144,8 @@ static struct ospf_neighbor *ospf_elect_bdr(struct ospf_interface *oi,
        else
                BDR(oi).s_addr = 0;
 
-       list_delete(bdr_list);
-       list_delete(no_dr_list);
+       list_delete(&bdr_list);
+       list_delete(&no_dr_list);
 
        return bdr;
 }
@@ -233,7 +232,7 @@ static int ospf_dr_election(struct ospf_interface *oi)
                zlog_debug("DR-Election[2nd]: DR     %s", inet_ntoa(DR(oi)));
        }
 
-       list_delete(el_list);
+       list_delete(&el_list);
 
        /* if DR or BDR changes, cause AdjOK? neighbor event. */
        if (!IPV4_ADDR_SAME(&old_dr, &DR(oi))
@@ -278,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)