454,7 → 454,6 |
{ |
int cards_found = 0; |
static int pci_index = 0; |
unsigned char pci_bus, pci_device_fn; |
|
if (! pcibios_present()) |
return cards_found; |
461,7 → 460,8 |
|
for (; pci_index < 8; pci_index++) { |
unsigned char pci_bus, pci_device_fn, pci_latency; |
long ioaddr; |
unsigned short int vendor,device; |
long ioaddr; |
int irq; |
|
u16 pci_command, new_command; |
473,7 → 473,17 |
!= PCIBIOS_SUCCESSFUL) |
break; |
|
pcibios_read_config_word(pci_bus, pci_device_fn, |
PCI_VENDOR_ID, &vendor); |
pcibios_read_config_word(pci_bus, pci_device_fn, |
PCI_DEVICE_ID, &device); |
|
printk("Device = %x Vendor = %x\n",(int)device,(int)vendor); |
|
if (vendor != PCI_VENDOR_ID_INTEL) |
break; |
|
|
#if defined(PCI_SUPPORT_VER2) |
{ |
struct pci_dev *pdev = pci_find_slot(pci_bus, pci_device_fn); |
589,8 → 599,8 |
printk(KERN_INFO "%s: %s at %#3lx, ", dev->name, product, ioaddr); |
|
for (i = 0; i < 5; i++) |
printk("%2.2X:", dev->dev_addr[i]); |
printk("%2.2X, IRQ %d.\n", dev->dev_addr[i], irq); |
printk("%2x:", dev->dev_addr[i]); |
printk("%2x, IRQ %d.\n", dev->dev_addr[i], irq); |
|
#ifndef kernel_bloat |
/* OK, this is pure kernel bloat. I don't like it when other drivers |
1225,7 → 1235,7 |
skb->dev = dev; |
skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ |
/* 'skb_put()' points to the start of sk_buff data area. */ |
#if 1 || USE_IP_CSUM |
#if 0 |
/* Packet is in one chunk -- we can copy + cksum. */ |
eth_copy_and_sum(skb, |
bus_to_virt(sp->rx_ringp[entry]->rx_buf_addr), |