Commit 00bc059e authored by Jeff Garzik's avatar Jeff Garzik

Merge http://linux.bkbits.net/gkernel-2.5

into rum.normnet.org:/spare/work/gkernel-2.5
parents 79b4dfa9 3d2d1221
...@@ -833,6 +833,10 @@ static int speedo_found1(struct pci_dev *pdev, ...@@ -833,6 +833,10 @@ static int speedo_found1(struct pci_dev *pdev,
sp->phy[0] = eeprom[6]; sp->phy[0] = eeprom[6];
sp->phy[1] = eeprom[7]; sp->phy[1] = eeprom[7];
sp->rx_bug = (eeprom[3] & 0x03) == 3 ? 0 : 1; sp->rx_bug = (eeprom[3] & 0x03) == 3 ? 0 : 1;
if (((pdev->device > 0x1030 && (pdev->device < 0x1039)))
|| (pdev->device == 0x2449)) {
sp->chip_id = 1;
}
if (sp->rx_bug) if (sp->rx_bug)
printk(KERN_INFO " Receiver lock-up workaround activated.\n"); printk(KERN_INFO " Receiver lock-up workaround activated.\n");
...@@ -1099,9 +1103,9 @@ static void speedo_timer(unsigned long data) ...@@ -1099,9 +1103,9 @@ static void speedo_timer(unsigned long data)
mdio_read(ioaddr, phy_num, 1); mdio_read(ioaddr, phy_num, 1);
/* If link beat has returned... */ /* If link beat has returned... */
if (mdio_read(ioaddr, phy_num, 1) & 0x0004) if (mdio_read(ioaddr, phy_num, 1) & 0x0004)
dev->flags |= IFF_RUNNING; netif_carrier_on(dev);
else else
dev->flags &= ~IFF_RUNNING; netif_carrier_off(dev);
} }
} }
if (speedo_debug > 3) { if (speedo_debug > 3) {
...@@ -1375,7 +1379,7 @@ speedo_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1375,7 +1379,7 @@ speedo_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* workaround for hardware bug on 10 mbit half duplex */ /* workaround for hardware bug on 10 mbit half duplex */
if ((sp->partner==0) && (sp->chip_id==1)) { if ((sp->partner == 0) || (sp->chip_id == 1)) {
wait_for_cmd_done(ioaddr + SCBCmd); wait_for_cmd_done(ioaddr + SCBCmd);
outb(0 , ioaddr + SCBCmd); outb(0 , ioaddr + SCBCmd);
} }
......
2002-02-07 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* tulip_core (tulip_pci_tbl[]):
Add PCI id for comet tulip clone.
2001-12-11 Jeff Garzik <jgarzik@mandrakesoft.com> 2001-12-11 Jeff Garzik <jgarzik@mandrakesoft.com>
* eeprom.c, timer.c, media.c, tulip_core.c: * eeprom.c, timer.c, media.c, tulip_core.c:
......
...@@ -202,6 +202,7 @@ static struct pci_device_id tulip_pci_tbl[] __devinitdata = { ...@@ -202,6 +202,7 @@ static struct pci_device_id tulip_pci_tbl[] __devinitdata = {
{ 0x1317, 0x1985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x1317, 0x1985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x13D1, 0xAB02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x13D1, 0xAB02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x13D1, 0xAB03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x13D1, 0xAB03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x13D1, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x104A, 0x0981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x104A, 0x0981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x104A, 0x2774, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, { 0x104A, 0x2774, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 }, { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 },
......
...@@ -1486,6 +1486,9 @@ ...@@ -1486,6 +1486,9 @@
#define PCI_DEVICE_ID_PANACOM_QUADMODEM 0x0400 #define PCI_DEVICE_ID_PANACOM_QUADMODEM 0x0400
#define PCI_DEVICE_ID_PANACOM_DUALMODEM 0x0402 #define PCI_DEVICE_ID_PANACOM_DUALMODEM 0x0402
#define PCI_VENDOR_ID_AFAVLAB 0x14db
#define PCI_DEVICE_ID_AFAVLAB_P028 0x2180
#define PCI_VENDOR_ID_BROADCOM 0x14e4 #define PCI_VENDOR_ID_BROADCOM 0x14e4
#define PCI_DEVICE_ID_TIGON3_5700 0x1644 #define PCI_DEVICE_ID_TIGON3_5700 0x1644
#define PCI_DEVICE_ID_TIGON3_5701 0x1645 #define PCI_DEVICE_ID_TIGON3_5701 0x1645
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment