Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / nhrpd / nhrp_interface.c

diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c
index 4ac30a7d75ed076aacfda2ad475b70b1b895381a..d396f510ed8177f20a70f86e9cc92060dc01ac86 100644 (file)
--- a/nhrpd/nhrp_interface.c
+++ b/nhrpd/nhrp_interface.c
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* NHRP interface
  * Copyright (c) 2014-2015 Timo Teräs
- *
- * This file is free software: you may copy, redistribute and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -184,16 +180,17 @@ void nhrp_interface_update_nbma(struct interface *ifp,
        struct nhrp_interface *nifp = ifp->info, *nbmanifp = NULL;
        struct interface *nbmaifp = NULL;
        union sockunion nbma;
+       struct in_addr saddr = {0};
 
        sockunion_family(&nbma) = AF_UNSPEC;
 
        if (nifp->source)
                nbmaifp = if_lookup_by_name(nifp->source, nifp->link_vrf_id);
 
-       switch (ifp->ll_type) {
-       case ZEBRA_LLT_IPGRE: {
-               struct in_addr saddr = {0};
-
+       if (ifp->ll_type != ZEBRA_LLT_IPGRE)
+               debugf(NHRP_DEBUG_IF, "%s: Ignoring non GRE interface type %u",
+                      __func__, ifp->ll_type);
+       else {
                if (!gre_info) {
                        nhrp_send_zebra_gre_request(ifp);
                        return;
@@ -214,9 +211,6 @@ void nhrp_interface_update_nbma(struct interface *ifp,
                        nbmaifp =
                                if_lookup_by_index(nifp->link_idx,
                                                   nifp->link_vrf_id);
-       } break;
-       default:
-               break;
        }
 
        if (nbmaifp)