Module Name: src
Committed By: roy
Date: Fri Apr 22 00:25:42 UTC 2016
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Change used from int to bool.
If used, abort the loop because we think we're already at the end.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/net/if_bridge.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_bridge.c
diff -u src/sys/net/if_bridge.c:1.117 src/sys/net/if_bridge.c:1.118
--- src/sys/net/if_bridge.c:1.117 Wed Apr 20 09:01:04 2016
+++ src/sys/net/if_bridge.c Fri Apr 22 00:25:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.117 2016/04/20 09:01:04 knakahara Exp $ */
+/* $NetBSD: if_bridge.c,v 1.118 2016/04/22 00:25:42 roy Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.117 2016/04/20 09:01:04 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.118 2016/04/22 00:25:42 roy Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -1453,7 +1453,7 @@ bridge_output(struct ifnet *ifp, struct
if (dst_if == NULL) {
struct bridge_iflist *bif;
struct mbuf *mc;
- int used = 0;
+ bool used = false;
BRIDGE_PSZ_RENTER(s);
BRIDGE_IFLIST_READER_FOREACH(bif, sc) {
@@ -1484,7 +1484,7 @@ bridge_output(struct ifnet *ifp, struct
if (PSLIST_READER_NEXT(bif, struct bridge_iflist,
bif_next) == NULL) {
- used = 1;
+ used = true;
mc = m;
} else {
mc = m_copym(m, 0, M_COPYALL, M_NOWAIT);
@@ -1504,10 +1504,15 @@ bridge_output(struct ifnet *ifp, struct
next:
BRIDGE_PSZ_RENTER(s);
bridge_release_member(sc, bif, &psref);
+
+ /* Guarantee we don't re-enter the loop as we already
+ * decided we're at the end. */
+ if (used)
+ break;
}
BRIDGE_PSZ_REXIT(s);
- if (used == 0)
+ if (!used)
m_freem(m);
return (0);
}
