diff options
| -rw-r--r-- | bgpd/bgp_bmp.c | 2 | ||||
| -rw-r--r-- | zebra/ioctl.c | 8 | ||||
| -rw-r--r-- | zebra/kernel_socket.c | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c index 96c34f9196..39158f0147 100644 --- a/bgpd/bgp_bmp.c +++ b/bgpd/bgp_bmp.c @@ -1619,6 +1619,8 @@ static void bmp_targets_put(struct bmp_targets *bt) struct bmp *bmp; struct bmp_active *ba; + THREAD_OFF(bt->t_stats); + frr_each_safe (bmp_actives, &bt->actives, ba) bmp_active_put(ba); diff --git a/zebra/ioctl.c b/zebra/ioctl.c index 9b6aaf1d85..a895ed9410 100644 --- a/zebra/ioctl.c +++ b/zebra/ioctl.c @@ -136,7 +136,7 @@ static int if_ioctl_ipv6(unsigned long request, caddr_t buffer) void if_get_metric(struct interface *ifp) { #ifdef SIOCGIFMETRIC - struct ifreq ifreq; + struct ifreq ifreq = {}; ifreq_set_name(&ifreq, ifp); @@ -153,7 +153,7 @@ void if_get_metric(struct interface *ifp) /* get interface MTU */ void if_get_mtu(struct interface *ifp) { - struct ifreq ifreq; + struct ifreq ifreq = {}; ifreq_set_name(&ifreq, ifp); @@ -410,8 +410,8 @@ int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx) void if_get_flags(struct interface *ifp) { int ret; - struct ifreq ifreqflags; - struct ifreq ifreqdata; + struct ifreq ifreqflags = {}; + struct ifreq ifreqdata = {}; ifreq_set_name(&ifreqflags, ifp); ifreq_set_name(&ifreqdata, ifp); diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index 6583af0a54..420e41e394 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -159,6 +159,9 @@ const struct message rtm_type_str[] = {{RTM_ADD, "RTM_ADD"}, #ifdef RTM_IFANNOUNCE {RTM_IFANNOUNCE, "RTM_IFANNOUNCE"}, #endif /* RTM_IFANNOUNCE */ +#ifdef RTM_IEEE80211 + {RTM_IEEE80211, "RTM_IEEE80211"}, +#endif {0}}; static const struct message rtm_flag_str[] = {{RTF_UP, "UP"}, @@ -1405,7 +1408,10 @@ static void kernel_read(struct thread *thread) #endif /* RTM_IFANNOUNCE */ default: if (IS_ZEBRA_DEBUG_KERNEL) - zlog_debug("Unprocessed RTM_type: %d", rtm->rtm_type); + zlog_debug( + "Unprocessed RTM_type: %s(%d)", + lookup_msg(rtm_type_str, rtm->rtm_type, NULL), + rtm->rtm_type); break; } } |