Do some cleanups of the HARP atm codes interface into the system:

Define the NETISR just like all the other NETISRs.

unifdef -Usun -D__FreeBSD__  we will probably never support sun4c
and if we do we can't use the solaris code anyway and  I doubt
anybody will be running Fore ATM cards in then in the first place.

1 files changed, 0 insertions, 84 deletions

diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 5cdd778..2ddf6fc 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -1120,90 +1120,7 @@ spans_dounload()
 }
 
 
-#ifdef sun
-/*
- * Loadable driver description
- */
-struct vdldrv spans_drv = {
-	VDMAGIC_PSEUDO,	/* Pseudo Driver */
-	"spans_mod",	/* name */
-	NULL,		/* dev_ops */
-	NULL,		/* bdevsw */
-	NULL,		/* cdevsw */
-	0,		/* blockmajor */
-	0		/* charmajor */
-};
-
-
-/*
- * Loadable module support entry point
- * 
- * This is the routine called by the vd driver for all loadable module
- * functions for this pseudo driver.  This routine name must be specified
- * on the modload(1) command.  This routine will be called whenever the
- * modload(1), modunload(1) or modstat(1) commands are issued for this
- * module.
- *
- * Arguments:
- *	cmd	vd command code
- *	vdp	pointer to vd driver's structure
- *	vdi	pointer to command-specific vdioctl_* structure
- *	vds	pointer to status structure (VDSTAT only)
- *
- * Returns:
- *	0 	command was successful 
- *	errno	command failed - reason indicated
- *
- */
-int
-spans_mod(cmd, vdp, vdi, vds)
-	int		cmd;
-	struct vddrv	*vdp;
-	caddr_t		vdi;
-	struct vdstat	*vds;
-{
-	int	err = 0;
-
-	switch (cmd) {
-
-	case VDLOAD:
-		/*
-		 * Module Load
-		 *
-		 * We dont support any user configuration
-		 */
-		err = spans_doload();
-		if (err == 0)
-			/* Let vd driver know about us */
-			vdp->vdd_vdtab = (struct vdlinkage *)&spans_drv;
-		break;
-
-	case VDUNLOAD:
-		/*
-		 * Module Unload
-		 */
-		err = spans_dounload();
-		break;
-
-	case VDSTAT:
-		/*
-		 * Module Status
-		 */
-
-		/* Not much to say at the moment */
-
-		break;
-
-	default:
-		log(LOG_ERR, "spans_mod: Unknown vd command 0x%x\n", cmd);
-		err = EINVAL;
-	}
-
-	return (err);
-}
-#endif	/* sun */
 
-#ifdef __FreeBSD__
 
 #include <sys/exec.h>
 #include <sys/sysent.h>
@@ -1291,7 +1208,6 @@ spans_mod(lkmtp, cmd, ver)
 	MOD_DISPATCH(spans, lkmtp, cmd, ver,
 		spans_load, spans_unload, lkm_nullcmd);
 }
-#endif	/* __FreeBSD__ */
 
 #else	/* !ATM_SPANS_MODULE */