[BK/GNU] net driver series 12

From: Jeff Garzik (jgarzik@pobox.com)
Date: Fri Oct 25 2002 - 17:50:41 EST


Marcelo,

I have pushed a tulip bug fix out to gkernel. Please do a

        bk pull http://gkernel.bkbits.net/net-drivers-2.4

to retrieve the simple tulip patch, which is attached to this email for
your review. The BK repository also contains the previous 34 patches I
sent to you yesterday, or the day before...


# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.759 -> 1.760
# drivers/net/tulip/tulip_core.c 1.35 -> 1.36
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/25 jgarzik@redhat.com 1.760
# Fix tulip net driver multi-port board irq assignment
# --------------------------------------------
#
diff -Nru a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
--- a/drivers/net/tulip/tulip_core.c Fri Oct 25 18:22:30 2002
+++ b/drivers/net/tulip/tulip_core.c Fri Oct 25 18:22:30 2002
@@ -1482,7 +1482,6 @@
         tp->timer.function = tulip_tbl[tp->chip_id].media_timer;
 
         dev->base_addr = ioaddr;
- dev->irq = irq;
 
 #ifdef CONFIG_TULIP_MWI
         if (!force_csr0 && (tp->flags & HAS_PCI_MWI))
@@ -1655,6 +1654,7 @@
         for (i = 0; i < 6; i++)
                 last_phys_addr[i] = dev->dev_addr[i];
         last_irq = irq;
+ dev->irq = irq;
 
         /* The lower four bits are the media type. */
         if (board_idx >= 0 && board_idx < MAX_UNITS) {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Oct 31 2002 - 22:00:29 EST