Module Name: src Committed By: martin Date: Mon Jul 31 15:29:23 UTC 2023
Modified Files: src/sys/arch/xen/xen [netbsd-9]: if_xennet_xenbus.c Log Message: Apply patch, requested by riastradh in ticket #1680, 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.86 -r1.86.4.1 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.86 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.86.4.1 --- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.86 Sat Mar 9 08:42:25 2019 +++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Jul 31 15:29:23 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: if_xennet_xenbus.c,v 1.86 2019/03/09 08:42:25 maxv Exp $ */ +/* $NetBSD: if_xennet_xenbus.c,v 1.86.4.1 2023/07/31 15:29:23 martin Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -84,7 +84,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.86 2019/03/09 08:42:25 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.86.4.1 2023/07/31 15:29:23 martin Exp $"); #include "opt_xen.h" #include "opt_nfs_boot.h" @@ -967,7 +967,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: