diff options
| -rw-r--r-- | sys/netinet/if_ether.c | 8 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 08a162f..ec03268 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -163,12 +163,10 @@ static void arptimer(void *arg) { struct ifnet *ifp; - struct llentry *lle = (struct llentry *)arg; + struct llentry *lle; - if (lle == NULL) { - panic("%s: NULL entry!\n", __func__); - return; - } + KASSERT(arg != NULL, ("%s: arg NULL", __func__)); + lle = (struct llentry *)arg; ifp = lle->lle_tbl->llt_ifp; CURVNET_SET(ifp->if_vnet); IF_AFDATA_LOCK(ifp); diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 7a54226..e9081c4 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -446,14 +446,9 @@ nd6_llinfo_timer(void *arg) struct ifnet *ifp; struct nd_ifinfo *ndi = NULL; + KASSERT(arg != NULL, ("%s: arg NULL", __func__)); ln = (struct llentry *)arg; - if (ln == NULL) { - panic("%s: NULL entry!\n", __func__); - return; - } - - if ((ifp = ((ln->lle_tbl != NULL) ? ln->lle_tbl->llt_ifp : NULL)) == NULL) - panic("ln ifp == NULL"); + ifp = ln->lle_tbl->llt_ifp; CURVNET_SET(ifp->if_vnet); |
