Module Name: src
Committed By: martin
Date: Mon Jul 31 15:31:44 UTC 2023
Modified Files:
src/sys/arch/xen/xen [netbsd-8]: if_xennet_xenbus.c
Log Message:
Apply patch, requested by riastradh in ticket #1863, pulling up
the essential part of
sys/arch/xen/xen/if_xennet_xenbus.c 1.129
xennet(4): Add missing membar.
To generate a diff of this commit:
cvs rdiff -u -r1.70.6.2 -r1.70.6.3 src/sys/arch/xen/xen/if_xennet_xenbus.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/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.2 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.3
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.2 Mon Jan 21 20:12:15 2019
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Jul 31 15:31:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.70.6.2 2019/01/21 20:12:15 martin Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.70.6.3 2023/07/31 15:31:43 martin Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70.6.2 2019/01/21 20:12:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70.6.3 2023/07/31 15:31:43 martin Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -947,7 +947,7 @@ again:
sc->sc_tx_ring.sring->rsp_event =
resp_prod + ((sc->sc_tx_ring.sring->req_prod - resp_prod) >> 1) + 1;
ifp->if_timer = 0;
- xen_wmb();
+ xen_mb();
if (resp_prod != sc->sc_tx_ring.sring->rsp_prod)
goto again;
end:
