Module Name: src
Committed By: pooka
Date: Sun Aug 15 18:40:42 UTC 2010
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
Don't do timestamping with buslock held. it's the little things ...
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/net/lib/libshmif/if_shmem.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/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.20 src/sys/rump/net/lib/libshmif/if_shmem.c:1.21
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.20 Fri Aug 13 10:13:44 2010
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Sun Aug 15 18:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.20 2010/08/13 10:13:44 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.21 2010/08/15 18:40:41 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.20 2010/08/13 10:13:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.21 2010/08/15 18:40:41 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -203,16 +203,16 @@
pktsize += m->m_len;
}
- shmif_lockbus(sc->sc_busmem);
- lastoff = sc->sc_busmem->shm_last;
- npktlenoff = shmif_nextpktoff(sc->sc_busmem, lastoff);
-
getmicrouptime(&tv);
sp.sp_len = pktsize;
sp.sp_sec = tv.tv_sec;
sp.sp_usec = tv.tv_usec;
+ shmif_lockbus(sc->sc_busmem);
+ lastoff = sc->sc_busmem->shm_last;
+ npktlenoff = shmif_nextpktoff(sc->sc_busmem, lastoff);
+
dataoff = shmif_buswrite(sc->sc_busmem,
npktlenoff, &sp, sizeof(sp), &wrap);
for (m = m0; m != NULL; m = m->m_next) {
