[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxsgec.c,1.13,1.14

[? <uns...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv28816/drivers/net

Modified Files:
	vaxsgec.c 
Log Message:
Kludge to share interrupts between VXT serial and network devices


Index: vaxsgec.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxsgec.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vaxsgec.c	31 May 2002 03:50:57 -0000	1.13
+++ vaxsgec.c	3 Jun 2002 02:43:45 -0000	1.14
@@ -602,6 +602,10 @@
   if (csr5 & SG_NICSR5_TI) sgec_tx(dev);
 }
 
+#ifdef CONFIG_VXT2694
+extern void (*net_inthandler_func)(int vector, void *data, struct pt_regs *fp);
+extern void *net_inthandler_data;
+#endif
 
 static int sgec_open(struct net_device *dev)
 {
@@ -614,10 +618,15 @@
 #endif
 
 	/* Associate IRQ with sgec_interrupt */
+#ifndef CONFIG_VXT2694
 	if (request_irq(dev->irq, &sgec_interrupt, 0, lp->name, dev)) {
 		printk("SGEC: Can't get irq %d\n", dev->irq);
 		return -EAGAIN;
 	}
+#else
+	net_inthandler_data = dev;
+	net_inthandler_func = sgec_interrupt;
+#endif
 
 	/* this is just a hack for now */
 #ifdef CONFIG_VSBUS