 @@ -1,14 +1,14 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.40 2011/04/06 23:51:55 jym Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.41 2011/04/20 20:32:38 jym 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.
+ *
 @@ -423,26 +423,27 @@ xennetback_xenbus_destroy(void *arg)
 	free(xneti, M_DEVBUF);
 	return 0;
+}
 static void
 xennetback_frontend_changed(void *arg, XenbusState new_state)
+{
 	struct xnetback_instance *xneti = arg;
 	struct xenbus_device *xbusd = xneti->xni_xbusd;
 	int err;
 	netif_tx_sring_t *tx_ring;
 	netif_rx_sring_t *rx_ring;
 	struct gnttab_map_grant_ref op;
 	struct gnttab_unmap_grant_ref uop;
 	evtchn_op_t evop;
 	u_long tx_ring_ref, rx_ring_ref;
 	u_long revtchn, rx_copy;
 	XENPRINTF(("%s: new state %d\n", xneti->xni_if.if_xname, new_state));
 	switch(new_state) {
 	case XenbusStateInitialising:
 	case XenbusStateInitialised:
 		break;
 	case XenbusStateConnected:
 		/* read comunication informations */
 		err = xenbus_read_ul(NULL, xbusd->xbusd_otherend,
 @@ -528,27 +529,27 @@ xennetback_frontend_changed(void *arg, X
 			    xneti->xni_if.if_xname, err, op.status);
 			goto err2;
+		}
 		xneti->xni_rx_ring_handle = op.handle;
 		BACK_RING_INIT(&xneti->xni_txring, tx_ring, PAGE_SIZE);
 		BACK_RING_INIT(&xneti->xni_rxring, rx_ring, PAGE_SIZE);
 		evop.cmd = EVTCHNOP_bind_interdomain;
 		evop.u.bind_interdomain.remote_dom = xneti->xni_domid;
 		evop.u.bind_interdomain.remote_port = revtchn;
 		err = HYPERVISOR_event_channel_op(&evop);
 		if (err) {
 			printf("%s: can't get event channel: %d\n",
 			    xneti->xni_if.if_xname, err);
-			goto err2;
+			goto err3;
+		}
 		xneti->xni_evtchn = evop.u.bind_interdomain.local_port;
 		xen_wmb();
 		xneti->xni_status = CONNECTED;
 		xenbus_switch_state(xbusd, NULL, XenbusStateConnected);
 		xen_wmb();
 		event_set_handler(xneti->xni_evtchn, xennetback_evthandler,
 		    xneti, IPL_NET, xneti->xni_if.if_xname);
 		xennetback_ifinit(&xneti->xni_if);
 		hypervisor_enable_event(xneti->xni_evtchn);
 		hypervisor_notify_via_evtchn(xneti->xni_evtchn);
 		break;
 @@ -560,26 +561,46 @@ xennetback_frontend_changed(void *arg, X
 		break;
 	case XenbusStateClosed:
 		/* otherend_changed() should handle it for us */
 		panic("xennetback_frontend_changed: closed\n");
 	case XenbusStateUnknown:
 	case XenbusStateInitWait:
 	default:
 		aprint_error("%s: invalid frontend state %d\n",
 		    xneti->xni_if.if_xname, new_state);
 		break;
+	}
 	return;
 err3:
 	uop.dev_bus_addr = 0;
 	uop.host_addr = xneti->xni_rx_ring_va;
 	uop.handle = xneti->xni_rx_ring_handle;
 	err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
 	    &uop, 1);
 	if (err)
 		aprint_error_ifnet(&xneti->xni_if,
 			"unmap_grant_ref failed: %d\n", err);
 	uop.host_addr = xneti->xni_tx_ring_va;
 	uop.handle = xneti->xni_tx_ring_handle;
 	err = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref,
 	    &uop, 1);
 	if (err)
 		aprint_error_ifnet(&xneti->xni_if,
 			"unmap_grant_ref failed: %d\n", err);
 err2:
 	uvm_km_free(kernel_map, xneti->xni_rx_ring_va,
 	    PAGE_SIZE, UVM_KMF_VAONLY);
 err1:
 	uvm_km_free(kernel_map, xneti->xni_tx_ring_va,
 	    PAGE_SIZE, UVM_KMF_VAONLY);
+}
 /* lookup a xneti based on domain id and interface handle */
 static struct xnetback_instance *
 xnetif_lookup(domid_t dom , uint32_t handle)
+{
 	struct xnetback_instance *xneti;