summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-08-26 09:40:31 +0000
committermpi <mpi@openbsd.org>2015-08-26 09:40:31 +0000
commitdd816bdfed48d2ab977ad135773d2e0dd10eaf56 (patch)
treed4a7ce5af852f81e2e5159e4e14ceb277758ce72
parentGet rid if em_align. This approach used to make sense, but now that the (diff)
downloadwireguard-openbsd-dd816bdfed48d2ab977ad135773d2e0dd10eaf56.tar.xz
wireguard-openbsd-dd816bdfed48d2ab977ad135773d2e0dd10eaf56.zip
Use the specialized m_copym2() preserving the alignment of the payload
in bridge_localbroadcast() too. This should fix another alignment issue kettenis@ is seeing. ok dlg@
-rw-r--r--sys/net/if_bridge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index eba150c93c7..a394ace4849 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.259 2015/08/24 21:28:47 bluhm Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.260 2015/08/26 09:40:31 mpi Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -1537,7 +1537,7 @@ bridge_localbroadcast(struct bridge_softc *sc, struct ifnet *ifp,
return;
}
- m1 = m_copym2(m, 0, M_COPYALL, M_DONTWAIT);
+ m1 = bridge_m_dup(m);
if (m1 == NULL) {
sc->sc_if.if_oerrors++;
return;