This matches the extensive comments and schema for related variables.
No functional change.

OK?

diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index c0b92f059c9..d793a0b07f4 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1084,7 +1084,7 @@ nd6_cache_lladdr(struct ifnet *ifp, struct in6_addr 
*from, char *lladdr,
 {
        struct rtentry *rt = NULL;
        struct llinfo_nd6 *ln = NULL;
-       int is_newentry;
+       int newentry;
        struct sockaddr_dl *sdl = NULL;
        int do_update;
        int olladdr;
@@ -1113,14 +1113,14 @@ nd6_cache_lladdr(struct ifnet *ifp, struct in6_addr 
*from, char *lladdr,
        rt = nd6_lookup(from, 0, ifp, ifp->if_rdomain);
        if (rt == NULL) {
                rt = nd6_lookup(from, 1, ifp, ifp->if_rdomain);
-               is_newentry = 1;
+               newentry = 1;
        } else {
                /* do not overwrite local or static entry */
                if (ISSET(rt->rt_flags, RTF_STATIC|RTF_LOCAL)) {
                        rtfree(rt);
                        return;
                }
-               is_newentry = 0;
+               newentry = 0;
        }
 
        if (!rt)
@@ -1175,7 +1175,7 @@ fail:
                bcopy(lladdr, LLADDR(sdl), ifp->if_addrlen);
        }
 
-       if (!is_newentry) {
+       if (!newentry) {
                if ((!olladdr && lladdr) ||             /* (3) */
                    (olladdr && lladdr && llchange)) {  /* (5) */
                        do_update = 1;
@@ -1259,7 +1259,7 @@ fail:
                /*
                 * New entry must have is_router flag cleared.
                 */
-               if (is_newentry)        /* (6-7) */
+               if (newentry)   /* (6-7) */
                        ln->ln_router = 0;
                break;
        case ND_REDIRECT:
@@ -1270,7 +1270,7 @@ fail:
                 */
                if (code == ND_REDIRECT_ROUTER)
                        ln->ln_router = 1;
-               else if (is_newentry) /* (6-7) */
+               else if (newentry) /* (6-7) */
                        ln->ln_router = 0;
                break;
        case ND_ROUTER_SOLICIT:
@@ -1283,8 +1283,8 @@ fail:
                /*
                 * Mark an entry with lladdr as a router.
                 */
-               if ((!is_newentry && (olladdr || lladdr)) ||    /* (2-5) */
-                   (is_newentry && lladdr)) {                  /* (7) */
+               if ((!newentry && (olladdr || lladdr)) ||       /* (2-5) */
+                   (newentry && lladdr)) {                     /* (7) */
                        ln->ln_router = 1;
                }
                break;

Reply via email to