Author: bz
Date: Wed Nov 17 10:43:20 2010
New Revision: 215423
URL: http://svn.freebsd.org/changeset/base/215423
Log:
Do not initialize flag variables before needed.
Consistently use the LLE_ prefix for lla_lookup() and the ND6_ prefix
for nd6_lookup() even though both are defined the same. Use the right
flag variable when checking each.
No real functional change.
MFC after: 4 days
Modified:
head/sys/netinet6/nd6.c
Modified: head/sys/netinet6/nd6.c
==============================================================================
--- head/sys/netinet6/nd6.c Wed Nov 17 09:49:51 2010 (r215422)
+++ head/sys/netinet6/nd6.c Wed Nov 17 10:43:20 2010 (r215423)
@@ -836,7 +836,7 @@ nd6_lookup(struct in6_addr *addr6, int f
{
struct sockaddr_in6 sin6;
struct llentry *ln;
- int llflags = 0;
+ int llflags;
bzero(&sin6, sizeof(sin6));
sin6.sin6_len = sizeof(struct sockaddr_in6);
@@ -845,13 +845,14 @@ nd6_lookup(struct in6_addr *addr6, int f
IF_AFDATA_LOCK_ASSERT(ifp);
+ llflags = 0;
if (flags & ND6_CREATE)
llflags |= LLE_CREATE;
if (flags & ND6_EXCLUSIVE)
llflags |= LLE_EXCLUSIVE;
ln = lla_lookup(LLTABLE6(ifp), llflags, (struct sockaddr *)&sin6);
- if ((ln != NULL) && (flags & LLE_CREATE))
+ if ((ln != NULL) && (llflags & LLE_CREATE))
ln->ln_state = ND6_LLINFO_NOSTATE;
return (ln);
@@ -1451,7 +1452,7 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
int do_update;
int olladdr;
int llchange;
- int flags = 0;
+ int flags;
int newstate = 0;
uint16_t router = 0;
struct sockaddr_in6 sin6;
@@ -1478,13 +1479,13 @@ nd6_cache_lladdr(struct ifnet *ifp, stru
* Spec says nothing in sections for RA, RS and NA. There's small
* description on it in NS section (RFC 2461 7.2.3).
*/
- flags |= lladdr ? ND6_EXCLUSIVE : 0;
+ flags = lladdr ? ND6_EXCLUSIVE : 0;
IF_AFDATA_LOCK(ifp);
ln = nd6_lookup(from, flags, ifp);
if (ln == NULL) {
- flags |= LLE_EXCLUSIVE;
- ln = nd6_lookup(from, flags |ND6_CREATE, ifp);
+ flags |= ND6_EXCLUSIVE;
+ ln = nd6_lookup(from, flags | ND6_CREATE, ifp);
IF_AFDATA_UNLOCK(ifp);
is_newentry = 1;
} else {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
