From 54c7754c6e7a3dea15906ba8a2031f68bc295f09 Mon Sep 17 00:00:00 2001 From: itojun Date: Sun, 15 Oct 2000 15:31:25 +0000 Subject: [PATCH] don't bark on nd6_storelladdr failure --- freebsd2/sys/net/if_ethersubr.c | 3 +-- freebsd2/sys/net/if_fddisubr.c | 3 +-- freebsd3/sys/net/if_ethersubr.c | 3 +-- freebsd3/sys/net/if_fddisubr.c | 3 +-- freebsd4/sys/net/if_ethersubr.c | 3 +-- freebsd4/sys/net/if_fddisubr.c | 3 +-- netbsd/sys/net/if_ethersubr.c | 3 +-- netbsd/sys/net/if_fddisubr.c | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/freebsd2/sys/net/if_ethersubr.c b/freebsd2/sys/net/if_ethersubr.c index 37c2687971..3700b3f0db 100644 --- a/freebsd2/sys/net/if_ethersubr.c +++ b/freebsd2/sys/net/if_ethersubr.c @@ -233,8 +233,7 @@ ether_output(ifp, m0, dst, rt0) return(0); /* if not yet resolves */ #else if (!nd6_storelladdr(&ac->ac_if, 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/freebsd2/sys/net/if_fddisubr.c b/freebsd2/sys/net/if_fddisubr.c index 8b20a7533e..20073b329a 100644 --- a/freebsd2/sys/net/if_fddisubr.c +++ b/freebsd2/sys/net/if_fddisubr.c @@ -226,8 +226,7 @@ fddi_output(ifp, m0, dst, rt0) return (0); /* if not yet resolved */ #else if (!nd6_storelladdr(&ac->ac_if, 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/freebsd3/sys/net/if_ethersubr.c b/freebsd3/sys/net/if_ethersubr.c index fc1a6725da..a40fa40826 100644 --- a/freebsd3/sys/net/if_ethersubr.c +++ b/freebsd3/sys/net/if_ethersubr.c @@ -272,8 +272,7 @@ ether_output(ifp, m0, dst, rt0) return(0); /* if not yet resolves */ #else if (!nd6_storelladdr(&ac->ac_if, 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/freebsd3/sys/net/if_fddisubr.c b/freebsd3/sys/net/if_fddisubr.c index bf214974c3..548b9c3ae2 100644 --- a/freebsd3/sys/net/if_fddisubr.c +++ b/freebsd3/sys/net/if_fddisubr.c @@ -219,8 +219,7 @@ fddi_output(ifp, m0, dst, rt0) return (0); /* if not yet resolved */ #else if (!nd6_storelladdr(&ac->ac_if, 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/freebsd4/sys/net/if_ethersubr.c b/freebsd4/sys/net/if_ethersubr.c index f4f508dd02..f41926674e 100644 --- a/freebsd4/sys/net/if_ethersubr.c +++ b/freebsd4/sys/net/if_ethersubr.c @@ -189,8 +189,7 @@ ether_output(ifp, m, dst, rt0) return(0); /* if not yet resolves */ #else if (!nd6_storelladdr(&ac->ac_if, 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/freebsd4/sys/net/if_fddisubr.c b/freebsd4/sys/net/if_fddisubr.c index e6d41a4276..0092e1bc7c 100644 --- a/freebsd4/sys/net/if_fddisubr.c +++ b/freebsd4/sys/net/if_fddisubr.c @@ -180,8 +180,7 @@ fddi_output(ifp, m, dst, rt0) return (0); /* if not yet resolved */ #else if (!nd6_storelladdr(&ac->ac_if, 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/netbsd/sys/net/if_ethersubr.c b/netbsd/sys/net/if_ethersubr.c index 5bdcd9ba42..53d2ba339a 100644 --- a/netbsd/sys/net/if_ethersubr.c +++ b/netbsd/sys/net/if_ethersubr.c @@ -276,8 +276,7 @@ ether_output(ifp, m0, dst, rt0) 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/netbsd/sys/net/if_fddisubr.c b/netbsd/sys/net/if_fddisubr.c index ea3a8d631c..d4b530c36c 100644 --- a/netbsd/sys/net/if_fddisubr.c +++ b/netbsd/sys/net/if_fddisubr.c @@ -273,8 +273,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 */