Module Name: src
Committed By: ozaki-r
Date: Mon Sep 2 05:12:53 UTC 2024
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c shmifvar.h
Log Message:
shmif: export LOCK_* definitions
They will be used by upcoming shmif_pcapin.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/rump/net/lib/libshmif/if_shmem.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/net/lib/libshmif/shmifvar.h
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.87 src/sys/rump/net/lib/libshmif/if_shmem.c:1.88
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.87 Tue Aug 20 16:49:10 2024
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Mon Sep 2 05:12:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.87 2024/08/20 16:49:10 riastradh Exp $ */
+/* $NetBSD: if_shmem.c,v 1.88 2024/09/02 05:12:53 ozaki-r Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.87 2024/08/20 16:49:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.88 2024/09/02 05:12:53 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -111,10 +111,6 @@ struct shmif_sc {
static void shmif_rcv(void *);
-#define LOCK_UNLOCKED 0
-#define LOCK_LOCKED 1
-#define LOCK_COOLDOWN 1001
-
vmem_t *shmif_units;
static void
Index: src/sys/rump/net/lib/libshmif/shmifvar.h
diff -u src/sys/rump/net/lib/libshmif/shmifvar.h:1.11 src/sys/rump/net/lib/libshmif/shmifvar.h:1.12
--- src/sys/rump/net/lib/libshmif/shmifvar.h:1.11 Fri Apr 3 13:57:48 2020
+++ src/sys/rump/net/lib/libshmif/shmifvar.h Mon Sep 2 05:12:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: shmifvar.h,v 1.11 2020/04/03 13:57:48 christos Exp $ */
+/* $NetBSD: shmifvar.h,v 1.12 2024/09/02 05:12:53 ozaki-r Exp $ */
/*-
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -63,6 +63,10 @@ struct shmif_pkthdr {
#define BUSMEM_SIZE (1024*1024U)
#define BUSMEM_DATASIZE (BUSMEM_SIZE - sizeof(struct shmif_mem))
+#define LOCK_UNLOCKED 0
+#define LOCK_LOCKED 1
+#define LOCK_COOLDOWN 1001
+
#if 0
#ifdef _KERNEL
#include <rump/rumpuser.h>