PERFORCE change 89275 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=89275

Change 89275 by kmacy at kmacy:freebsd7_xen3 on 2006/01/06 17:17:52

	update copyright
	remove dead code

Affected files ...

.. //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#4 edit

Differences ...

==== //depot/projects/xen3/src/sys/dev/xen/netfront/netfront.c#4 (text+ko) ====

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2004-2005 Kip Macy
+ * Copyright (c) 2004-2006 Kip Macy
  * All rights reserved.
  *
  *
@@ -16,8 +16,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_nfsroot.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -124,34 +122,6 @@
         struct mbuf		*xn_rx_chain[NET_RX_RING_SIZE+1];
 };
 
-struct xn_softc {
-	struct arpcom		arpcom;		/* interface info */
-	device_t		xn_dev;
-	SLIST_ENTRY(xn_softc)	xn_links;
-	void			*xn_intrhand;
-	struct resource		*xn_res;
-	u_int8_t		xn_ifno;	/* interface number */
-
-	int			xn_txcnt;
-	int			xn_rxbufcnt;
-	unsigned int		xn_irq;
-        unsigned int            xn_evtchn;  
-
-
-    /* What is the status of our connection to the remote backend? */
-#define BEST_CLOSED       0
-#define BEST_DISCONNECTED 1
-#define BEST_CONNECTED    2
-    	unsigned int 		xn_backend_state;
-
-    /* Is this interface open or closed (down or up)? */
-#define UST_CLOSED        0
-#define UST_OPEN          1
-    	unsigned int 		xn_user_state;
-    
-	int 			xn_rx_target;	/* number to allocate */
-
-};
 
 static unsigned long rx_pfn_array[NET_RX_RING_SIZE];
 static multicall_entry_t rx_mcl[NET_RX_RING_SIZE+1];
@@ -1459,15 +1429,7 @@
 
 static void netif_disconnect_backend(struct netfront_info *info)
 {
-#if 0
-	/* Stop old i/f to prevent errors whilst we rebuild the state. */
-	mtx_lock_spin(&info->tx_lock);
-	mtx_lock(&info->rx_lock);
-	netif_stop_queue(info->netdev);
-	/* info->backend_state = BEST_DISCONNECTED; */
-	mtx_unlock(&info->rx_lock);
-	mtx_unlock_spin(&info->tx_lock);
-#endif
+	xn_stop(info);
 	end_access(info->tx_ring_ref, info->tx.sring);
 	end_access(info->rx_ring_ref, info->rx.sring);
 	info->tx_ring_ref = GRANT_INVALID_REF;
@@ -1510,28 +1472,14 @@
 	.otherend_changed = backend_changed,
 };
 
-#if 0
-static struct notifier_block notifier_inetdev = {
-	.notifier_call  = inetdev_notify,
-	.next           = NULL,
-	.priority       = 0
-};
-#endif
-
 static void
 netif_init(void *unused)
 {
 	if (xen_start_info->flags & SIF_INITDOMAIN)
 		return;
-#if 0
-	if ((err = xennet_proc_init()) != 0)
-		return err;
-#endif
+
 	IPRINTK("Initialising virtual ethernet driver.\n");
 
-#if 0
-	(void)register_inetaddr_notifier(&notifier_inetdev);
-#endif
 	xenbus_register_frontend(&netfront);