all:

Removed ifnet.if_init and ifnet.if_reset as they are generally unused.
Change the parameter passed to if_watchdog to be a ifnet * rather than
a unit number. All of this is an attempt to move toward not needing an
array of softc pointers (which is usually static in size) to point to
the driver softc.

if_ed.c:
Changed some of the argument passing to some functions to make a little
more sense.

if_ep.c, if_vx.c:
Killed completely bogus use of if_timer. It was being set in such a way
that the interface was being reset once per second (blech!).

1 files changed, 2 insertions, 6 deletions

diff --git a/sys/net/if.h b/sys/net/if.h
index 46e5213..19bd37d 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $Id: if.h,v 1.22 1995/08/31 15:21:31 wollman Exp $
+ * $Id: if.h,v 1.23 1995/10/13 19:48:00 wollman Exp $
  */
 
 #ifndef _NET_IF_H_
@@ -135,8 +135,6 @@ struct ifnet {
 	short	if_flags;		/* up/down, broadcast, etc. */
 	struct	if_data if_data;
 /* procedure handles */
-	void	(*if_init)		/* init routine */
-		__P((int));
 	int	(*if_output)		/* output routine (enqueue) */
 		__P((struct ifnet *, struct mbuf *, struct sockaddr *,
 		     struct rtentry *));
@@ -146,10 +144,8 @@ struct ifnet {
 		__P((struct ifnet *));	/* (XXX not used; fake prototype) */
 	int	(*if_ioctl)		/* ioctl routine */
 		__P((struct ifnet *, int, caddr_t));
-	void	(*if_reset)
-		__P((int));		/* new autoconfig will permit removal */
 	void	(*if_watchdog)		/* timer routine */
-		__P((int));
+		__P((struct ifnet *));
 	struct	ifqueue if_snd;		/* output queue */
 	void 	*if_private[IF_NPRIVATE]; /* opaque data for various clients */
 };