1.1 --- a/netbsd-2.0-xen-sparse/sys/arch/xen/xen/if_xennet.c	Mon Sep 27 01:01:43 2004 +0000
     1.2 +++ b/netbsd-2.0-xen-sparse/sys/arch/xen/xen/if_xennet.c	Mon Sep 27 10:34:30 2004 +0000
     1.3 @@ -121,8 +121,8 @@ static void xennet_hex_dump(unsigned cha
     1.4  int xennet_match (struct device *, struct cfdata *, void *);
     1.5  void xennet_attach (struct device *, struct device *, void *);
     1.6  static void xennet_ctrlif_rx(ctrl_msg_t *, unsigned long);
     1.7 -static void xennet_driver_status_change(netif_fe_driver_status_changed_t *);
     1.8 -static void xennet_status_change(netif_fe_interface_status_changed_t *);
     1.9 +static void xennet_driver_status_change(netif_fe_driver_status_t *);
    1.10 +static void xennet_status_change(netif_fe_interface_status_t *);
    1.11  static void xennet_tx_mbuf_free(struct mbuf *, caddr_t, size_t, void *);
    1.12  static void xennet_rx_mbuf_free(struct mbuf *, caddr_t, size_t, void *);
    1.13  static int xen_network_handler(void *);
    1.14 @@ -176,7 +176,7 @@ xennet_scan(struct device *self, struct 
    1.15      cfprint_t print)
    1.16  {
    1.17  	ctrl_msg_t cmsg;
    1.18 -	netif_fe_driver_status_changed_t st;
    1.19 +	netif_fe_driver_status_t st;
    1.20  	int err = 0;
    1.21  
    1.22  	if ((xen_start_info.flags & SIF_INITDOMAIN) ||
    1.23 @@ -193,8 +193,8 @@ xennet_scan(struct device *self, struct 
    1.24  
    1.25  	/* Send a driver-UP notification to the domain controller. */
    1.26  	cmsg.type      = CMSG_NETIF_FE;
    1.27 -	cmsg.subtype   = CMSG_NETIF_FE_DRIVER_STATUS_CHANGED;
    1.28 -	cmsg.length    = sizeof(netif_fe_driver_status_changed_t);
    1.29 +	cmsg.subtype   = CMSG_NETIF_FE_DRIVER_STATUS;
    1.30 +	cmsg.length    = sizeof(netif_fe_driver_status_t);
    1.31  	st.status      = NETIF_DRIVER_STATUS_UP;
    1.32  	st.max_handle  = 0;
    1.33  	memcpy(cmsg.msg, &st, sizeof(st));
    1.34 @@ -276,18 +276,18 @@ xennet_ctrlif_rx(ctrl_msg_t *msg, unsign
    1.35  	int respond = 1;
    1.36  
    1.37  	switch (msg->subtype) {
    1.38 -	case CMSG_NETIF_FE_INTERFACE_STATUS_CHANGED:
    1.39 -		if (msg->length != sizeof(netif_fe_interface_status_changed_t))
    1.40 +	case CMSG_NETIF_FE_INTERFACE_STATUS:
    1.41 +		if (msg->length != sizeof(netif_fe_interface_status_t))
    1.42  			goto error;
    1.43  		xennet_status_change(
    1.44 -			(netif_fe_interface_status_changed_t *)&msg->msg[0]);
    1.45 +			(netif_fe_interface_status_t *)&msg->msg[0]);
    1.46  		break;
    1.47  
    1.48 -	case CMSG_NETIF_FE_DRIVER_STATUS_CHANGED:
    1.49 -		if (msg->length != sizeof(netif_fe_driver_status_changed_t))
    1.50 +	case CMSG_NETIF_FE_DRIVER_STATUS:
    1.51 +		if (msg->length != sizeof(netif_fe_driver_status_t))
    1.52  			goto error;
    1.53  		xennet_driver_status_change(
    1.54 -			(netif_fe_driver_status_changed_t *)&msg->msg[0]);
    1.55 +			(netif_fe_driver_status_t *)&msg->msg[0]);
    1.56  		break;
    1.57  
    1.58  	error:
    1.59 @@ -301,7 +301,7 @@ xennet_ctrlif_rx(ctrl_msg_t *msg, unsign
    1.60  }
    1.61  
    1.62  static void
    1.63 -xennet_driver_status_change(netif_fe_driver_status_changed_t *status)
    1.64 +xennet_driver_status_change(netif_fe_driver_status_t *status)
    1.65  {
    1.66  	struct xennet_attach_args xneta;
    1.67  	int i;
    1.68 @@ -321,7 +321,7 @@ xennet_driver_status_change(netif_fe_dri
    1.69  }
    1.70  
    1.71  static void
    1.72 -xennet_status_change(netif_fe_interface_status_changed_t *status)
    1.73 +xennet_status_change(netif_fe_interface_status_t *status)
    1.74  {
    1.75  	ctrl_msg_t cmsg;
    1.76  	netif_fe_interface_connect_t up;
    1.77 @@ -350,8 +350,8 @@ xennet_status_change(netif_fe_interface_
    1.78  	ifp = &sc->sc_ethercom.ec_if;
    1.79  
    1.80  	switch (status->status) {
    1.81 -	case NETIF_INTERFACE_STATUS_DESTROYED:
    1.82 -		printf("Unexpected netif-DESTROYED message in state %d\n",
    1.83 +	case NETIF_INTERFACE_STATUS_CLOSED:
    1.84 +		printf("Unexpected netif-CLOSED message in state %d\n",
    1.85  		    sc->sc_backend_state);
    1.86  		break;
    1.87