From 401df2f29615d0f3afa419c19b40ddf99b953f0b Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 9 Aug 2005 08:37:28 +0000
Subject: [PATCH] - Use 'error' variable to store error value, instead of 'i'.
 - Push 'i' into the only block where it is used. - Remove redundant check for
 rt being NULL. If rt_check() hasn't   returned an error, then rt is valid.

Reviewed by:	gnn
---
 sys/netinet6/nd6.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index f93df61f8fb..76efccf493a 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -2028,11 +2028,13 @@ nd6_storelladdr(ifp, rt0, m, dst, desten)
 	struct sockaddr *dst;
 	u_char *desten;
 {
-	int i;
 	struct sockaddr_dl *sdl;
 	struct rtentry *rt;
+	int error;
 
 	if (m->m_flags & M_MCAST) {
+		int i;
+
 		switch (ifp->if_type) {
 		case IFT_ETHER:
 		case IFT_FDDI:
@@ -2063,17 +2065,12 @@ nd6_storelladdr(ifp, rt0, m, dst, desten)
 		}
 	}
 
-	i = rt_check(&rt, &rt0, dst);
-	if (i) {
+	error = rt_check(&rt, &rt0, dst);
+	if (error) {
 		m_freem(m);
-		return i;
+		return (error);
 	}
 
-	if (rt == NULL) {
-		/* this could happen, if we could not allocate memory */
-		m_freem(m);
-		return (ENOMEM);
-	}
 	if (rt->rt_gateway->sa_family != AF_LINK) {
 		printf("nd6_storelladdr: something odd happens\n");
 		m_freem(m);