diff options
| author | itojun <itojun@NetBSD.org> | 2000-10-15 15:39:11 +0000 |
|---|---|---|
| committer | itojun <itojun@NetBSD.org> | 2000-10-15 15:39:11 +0000 |
| commit | d7a216bb96b2ae40aff3d80cdcd5bf0d8e95c20f (patch) | |
| tree | 5a4f0c3169942fd9e422a140b096d20a9ccdab3e /sys | |
| parent | 5cb0a986bd2120d179f57ba532af7ca8cd7e9808 (diff) | |
suppress warning on nd6_storelladdr failure. the failure could happen
easily when we have routing table with too many entries. sync with kame.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_ethersubr.c | 5 | ||||
| -rw-r--r-- | sys/net/if_fddisubr.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 11 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index d73a4b1099c..c248a909d4c 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ethersubr.c,v 1.66 2000/10/11 16:53:41 thorpej Exp $ */ +/* $NetBSD: if_ethersubr.c,v 1.67 2000/10/15 15:39:11 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -269,8 +269,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, return(0); /* if not yet resolves */ #else if (!nd6_storelladdr(ifp, rt, m, dst, (u_char *)edst)){ - /* this must be impossible, so we bark */ - printf("nd6_storelladdr failed\n"); + /* something bad happened */ return(0); } #endif /* OLDIP6OUTPUT */ diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index f31b6a4674a..4cc17d4c23e 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fddisubr.c,v 1.33 2000/06/14 05:10:28 mycroft Exp $ */ +/* $NetBSD: if_fddisubr.c,v 1.34 2000/10/15 15:39:11 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -277,8 +277,7 @@ fddi_output(ifp, m0, dst, rt0) return (0); /* if not yet resolved */ #else if (!nd6_storelladdr(ifp, rt, m, dst, (u_char *)edst)){ - /* this must be impossible, so we bark */ - printf("nd6_storelladdr failed\n"); + /* something bad happened */ return(0); } #endif /* OLDIP6OUTPUT */ diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index b052d568319..ffd2d404e2b 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,5 +1,5 @@ -/* $NetBSD: nd6.c,v 1.31 2000/07/06 12:36:19 itojun Exp $ */ -/* $KAME: nd6.c,v 1.68 2000/07/02 14:48:02 itojun Exp $ */ +/* $NetBSD: nd6.c,v 1.32 2000/10/15 15:39:12 itojun Exp $ */ +/* $KAME: nd6.c,v 1.75 2000/10/15 15:23:11 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -1977,8 +1977,11 @@ nd6_storelladdr(ifp, rt, m, dst, desten) } } - if (rt == NULL || - rt->rt_gateway->sa_family != AF_LINK) { + if (rt == NULL) { + /* this could happen, if we could not allocate memory */ + return(0); + } + if (rt->rt_gateway->sa_family != AF_LINK) { printf("nd6_storelladdr: something odd happens\n"); return(0); } |
