Module Name: src Committed By: riastradh Date: Sat Feb 25 00:37:47 UTC 2023
Modified Files: src/sys/arch/xen/xen: xennetback_xenbus.c Log Message: xennetback(4): Nix trailing whitespace. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/xen/xen/xennetback_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/xennetback_xenbus.c diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.111 src/sys/arch/xen/xen/xennetback_xenbus.c:1.112 --- src/sys/arch/xen/xen/xennetback_xenbus.c:1.111 Sat Feb 25 00:34:36 2023 +++ src/sys/arch/xen/xen/xennetback_xenbus.c Sat Feb 25 00:37:47 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: xennetback_xenbus.c,v 1.111 2023/02/25 00:34:36 riastradh Exp $ */ +/* $NetBSD: xennetback_xenbus.c,v 1.112 2023/02/25 00:37:47 riastradh Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.111 2023/02/25 00:34:36 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.112 2023/02/25 00:37:47 riastradh Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -117,7 +117,7 @@ struct xnetback_instance { grant_handle_t xni_tx_ring_handle; /* to unmap the ring */ grant_handle_t xni_rx_ring_handle; vaddr_t xni_tx_ring_va; /* to unmap the ring */ - vaddr_t xni_rx_ring_va; + vaddr_t xni_rx_ring_va; /* arrays used in xennetback_ifstart(), used for both Rx and Tx */ gnttab_copy_t xni_gop_copy[NB_XMIT_PAGES_BATCH]; @@ -782,7 +782,7 @@ xennetback_tx_m0len_fragment(struct xnet { netif_tx_request_t *txreq; - /* This assumes all the requests are already pushed into the ring */ + /* This assumes all the requests are already pushed into the ring */ *cntp = 1; do { txreq = RING_GET_REQUEST(&xneti->xni_txring, req_cons); @@ -1269,7 +1269,7 @@ again: * here, as the frontend doesn't notify when adding * requests anyway */ - if (__predict_false(abort || + if (__predict_false(abort || !RING_HAS_UNCONSUMED_REQUESTS(&xneti->xni_rxring))) { /* ring full */ ifp->if_timer = 1;