Module Name: src
Committed By: ozaki-r
Date: Mon Sep 7 01:17:37 UTC 2015
Modified Files:
src/sys/netinet: if_arp.c
Log Message:
CID 1322878: simplify log output flow
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/netinet/if_arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/if_arp.c
diff -u src/sys/netinet/if_arp.c:1.176 src/sys/netinet/if_arp.c:1.177
--- src/sys/netinet/if_arp.c:1.176 Wed Sep 2 09:28:13 2015
+++ src/sys/netinet/if_arp.c Mon Sep 7 01:17:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_arp.c,v 1.176 2015/09/02 09:28:13 christos Exp $ */
+/* $NetBSD: if_arp.c,v 1.177 2015/09/07 01:17:37 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.176 2015/09/02 09:28:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_arp.c,v 1.177 2015/09/07 01:17:37 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -787,7 +787,6 @@ arpresolve(struct ifnet *ifp, struct rte
int renew;
int flags = 0;
int error;
- bool create;
la = arplookup(ifp, m, &satocsin(dst)->sin_addr, 1, 0, 0, rt);
if (la != NULL)
@@ -830,7 +829,6 @@ arpresolve(struct ifnet *ifp, struct rte
#endif
retry:
- create = false;
if (la == NULL) {
IF_AFDATA_RLOCK(ifp);
la = lla_lookup(LLTABLE(ifp), flags, dst);
@@ -843,20 +841,20 @@ retry:
#else
&& ((ifp->if_flags & IFF_NOARP) == 0)) {
#endif
- create = true;
flags |= LLE_EXCLUSIVE;
IF_AFDATA_WLOCK(ifp);
la = lla_create(LLTABLE(ifp), flags, dst);
IF_AFDATA_WUNLOCK(ifp);
- }
- if (la == NULL) {
- if (create) {
+ if (la == NULL) {
log(LOG_DEBUG,
"%s: failed to create llentry for %s on %s\n",
__func__, inet_ntoa(satocsin(dst)->sin_addr),
ifp->if_xname);
}
+ }
+
+ if (la == NULL) {
m_freem(m);
return 0;
}
