Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32497
Modified Files:
sgec.c
Log Message:
- The Station Address ROM on a VAXserver 4000 Model 300 contains the
"useful" bytes at the 2nd low byte, not at the low byte.
- (Notice that the KA670 support isn't yet checked in into CVS.)
- Don't yet fiddle with interrupts -- doesn't yet work on my machines.
Index: sgec.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/net/sgec.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sgec.c 8 Oct 2004 22:44:38 -0000 1.3
+++ sgec.c 28 Oct 2004 19:23:42 -0000 1.4
@@ -665,10 +665,14 @@
last_dev = dev;
/* Associate IRQ with sgec_interrupt */
+ if (0){
if (vsbus_request_irq (lp->vsbus_int, &sgec_interrupt, 0, lp->name, dev)) {
printk("SGEC: Can't get irq %d\n", dev->irq);
return -EAGAIN;
}
+ } else {
+ printk (KERN_ERR "Ignoring interrupt for now...\n");
+ }
sgec_stop(ll);
@@ -929,14 +933,17 @@
*/
printk("Ethernet address in ROM: ");
for (i = 0; i < 6; i++) {
- dev->dev_addr[i] = esar[i] & 0xff;
+ if (is_ka670 ())
+ dev->dev_addr[i] = (esar[i] & 0xff00) >> 8;
+ else
+ dev->dev_addr[i] = esar[i] & 0xff;
printk("%2.2x%c", dev->dev_addr[i], i == 5 ? '\n' : ':');
}
/* Don't need this any more */
iounmap (esar);
- printk (KERN_INFO "Using LANCE interrupt vector %d, vsbus irq %d\n",
+ printk (KERN_INFO "Using SGEC interrupt vector %d, vsbus irq %d\n",
dev->irq, lp->vsbus_int);
dev->open = &sgec_open;
|
