 @@ -1,14 +1,14 @@
-/*      $NetBSD: if_xennet_xenbus.c,v 1.63 2014/08/10 16:44:35 tls Exp $      */
+/*      $NetBSD: if_xennet_xenbus.c,v 1.63.2.1 2016/03/06 18:52:06 martin Exp $      */
 /*
  * Copyright (c) 2006 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -75,27 +75,27 @@
  * Purpose is to process the packets received from the outside. RX buffers
  * are pre-allocated through xennet_alloc_rx_buffer(), during xennet autoconf
  * attach. During pre-allocation, frontend pushes requests in the I/O ring, in
  * preparation for incoming packets from backend.
  * When RX packets need to be processed, backend takes the requests previously
  * offered by frontend and pushes the associated responses inside the I/O ring.
  * When done, it notifies frontend through an event notification, which will
  * asynchronously call xennet_handler() in frontend.
  * xennet_handler() processes the responses, generates the associated mbuf, and
  * passes it to the MI layer for further processing.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.63 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.63.2.1 2016/03/06 18:52:06 martin Exp $");
 #include "opt_xen.h"
 #include "opt_nfs_boot.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/intr.h>
 #include <sys/rnd.h>
 @@ -411,26 +411,27 @@ xennet_xenbus_attach(device_t parent, de
+}
 static int
 xennet_xenbus_detach(device_t self, int flags)
+{
 	struct xennet_xenbus_softc *sc = device_private(self);
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	int s0, s1;
 	RING_IDX i;
 	DPRINTF(("%s: xennet_xenbus_detach\n", device_xname(self)));
 	s0 = splnet();
 	xennet_stop(ifp, 1);
 	event_remove_handler(sc->sc_evtchn, &xennet_handler, sc);
 	/* wait for pending TX to complete, and collect pending RX packets */
 	xennet_handler(sc);
 	while (sc->sc_tx_ring.sring->rsp_prod != sc->sc_tx_ring.rsp_cons) {
 		tsleep(xennet_xenbus_detach, PRIBIO, "xnet_detach", hz/2);
 		xennet_handler(sc);
+	}
 	xennet_free_rx_buffer(sc);
 	s1 = splvm();
 	for (i = 0; i < NET_RX_RING_SIZE; i++) {
 		struct xennet_rxreq *rxreq = &sc->sc_rxreqs[i];
 		uvm_km_free(kernel_map, rxreq->rxreq_va, PAGE_SIZE,
 		    UVM_KMF_WIRED);
 @@ -446,27 +447,26 @@ xennet_xenbus_detach(device_t self, int
 	while (xengnt_status(sc->sc_tx_ring_gntref)) {
 		tsleep(xennet_xenbus_detach, PRIBIO, "xnet_txref", hz/2);
+	}
 	xengnt_revoke_access(sc->sc_tx_ring_gntref);
 	uvm_km_free(kernel_map, (vaddr_t)sc->sc_tx_ring.sring, PAGE_SIZE,
 	    UVM_KMF_WIRED);
 	while (xengnt_status(sc->sc_rx_ring_gntref)) {
 		tsleep(xennet_xenbus_detach, PRIBIO, "xnet_rxref", hz/2);
+	}
 	xengnt_revoke_access(sc->sc_rx_ring_gntref);
 	uvm_km_free(kernel_map, (vaddr_t)sc->sc_rx_ring.sring, PAGE_SIZE,
 	    UVM_KMF_WIRED);
 	softint_disestablish(sc->sc_softintr);
 	event_remove_handler(sc->sc_evtchn, &xennet_handler, sc);
 	splx(s0);
 	pmf_device_deregister(self);
 	DPRINTF(("%s: xennet_xenbus_detach done\n", device_xname(self)));
 	return 0;
+}
 static bool
 xennet_xenbus_resume(device_t dev, const pmf_qual_t *qual)
+{
 	struct xennet_xenbus_softc *sc = device_private(dev);
 	int error;