Module Name: src
Committed By: martin
Date: Wed Jul 11 16:50:46 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if_llatbl.c
Log Message:
Additionally pullup src/sys/net/if_llatbl.c r1.30 to fix build fallout
from previous, requested by both ozaki-r (ticket #918) and kre (ticket #920):
Update previous so that there is no unused (but assigned) variable
left when there is no ARP. Thanks gcc!
To generate a diff of this commit:
cvs rdiff -u -r1.18.6.6 -r1.18.6.7 src/sys/net/if_llatbl.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/net/if_llatbl.c
diff -u src/sys/net/if_llatbl.c:1.18.6.6 src/sys/net/if_llatbl.c:1.18.6.7
--- src/sys/net/if_llatbl.c:1.18.6.6 Tue Jul 10 15:31:33 2018
+++ src/sys/net/if_llatbl.c Wed Jul 11 16:50:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_llatbl.c,v 1.18.6.6 2018/07/10 15:31:33 martin Exp $ */
+/* $NetBSD: if_llatbl.c,v 1.18.6.7 2018/07/11 16:50:46 martin Exp $ */
/*
* Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
* Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -695,12 +695,14 @@ lla_rt_output(const u_char rtm_type, con
* conditions so remove it first.
*/
if (lle != NULL) {
- size_t pkts_dropped = llentry_free(lle);
#if defined(INET) && NARP > 0
+ size_t pkts_dropped = llentry_free(lle);
if (dst->sa_family == AF_INET) {
arp_stat_add(ARP_STAT_DFRDROPPED,
(uint64_t)pkts_dropped);
}
+#else
+ (void) llentry_free(lle);
#endif
}
