diff options
Diffstat (limited to 'drivers/net/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 56f81a2bec5b..b7f471651df1 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -486,23 +486,23 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
486 | #else | 486 | #else |
487 | int bar = 1; | 487 | int bar = 1; |
488 | #endif | 488 | #endif |
489 | 489 | ||
490 | /* when built into the kernel, we only print version if device is found */ | 490 | /* when built into the kernel, we only print version if device is found */ |
491 | #ifndef MODULE | 491 | #ifndef MODULE |
492 | static int printed_version; | 492 | static int printed_version; |
493 | if (!printed_version++) | 493 | if (!printed_version++) |
494 | printk(version); | 494 | printk(version); |
495 | #endif | 495 | #endif |
496 | 496 | ||
497 | card_idx++; | 497 | card_idx++; |
498 | sprintf(boardname, "fealnx%d", card_idx); | 498 | sprintf(boardname, "fealnx%d", card_idx); |
499 | 499 | ||
500 | option = card_idx < MAX_UNITS ? options[card_idx] : 0; | 500 | option = card_idx < MAX_UNITS ? options[card_idx] : 0; |
501 | 501 | ||
502 | i = pci_enable_device(pdev); | 502 | i = pci_enable_device(pdev); |
503 | if (i) return i; | 503 | if (i) return i; |
504 | pci_set_master(pdev); | 504 | pci_set_master(pdev); |
505 | 505 | ||
506 | len = pci_resource_len(pdev, bar); | 506 | len = pci_resource_len(pdev, bar); |
507 | if (len < MIN_REGION_SIZE) { | 507 | if (len < MIN_REGION_SIZE) { |
508 | dev_err(&pdev->dev, | 508 | dev_err(&pdev->dev, |
@@ -513,7 +513,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
513 | i = pci_request_regions(pdev, boardname); | 513 | i = pci_request_regions(pdev, boardname); |
514 | if (i) | 514 | if (i) |
515 | return i; | 515 | return i; |
516 | 516 | ||
517 | irq = pdev->irq; | 517 | irq = pdev->irq; |
518 | 518 | ||
519 | ioaddr = pci_iomap(pdev, bar, len); | 519 | ioaddr = pci_iomap(pdev, bar, len); |
@@ -660,7 +660,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
660 | dev->ethtool_ops = &netdev_ethtool_ops; | 660 | dev->ethtool_ops = &netdev_ethtool_ops; |
661 | dev->tx_timeout = &tx_timeout; | 661 | dev->tx_timeout = &tx_timeout; |
662 | dev->watchdog_timeo = TX_TIMEOUT; | 662 | dev->watchdog_timeo = TX_TIMEOUT; |
663 | 663 | ||
664 | err = register_netdev(dev); | 664 | err = register_netdev(dev); |
665 | if (err) | 665 | if (err) |
666 | goto err_out_free_tx; | 666 | goto err_out_free_tx; |
@@ -865,25 +865,25 @@ static int netdev_open(struct net_device *dev) | |||
865 | Tx and Rx queues and the address filter list. | 865 | Tx and Rx queues and the address filter list. |
866 | FIXME (Ueimor): optimistic for alpha + posted writes ? */ | 866 | FIXME (Ueimor): optimistic for alpha + posted writes ? */ |
867 | #if defined(__powerpc__) || defined(__sparc__) | 867 | #if defined(__powerpc__) || defined(__sparc__) |
868 | // 89/9/1 modify, | 868 | // 89/9/1 modify, |
869 | // np->bcrvalue=0x04 | 0x0x38; /* big-endian, 256 burst length */ | 869 | // np->bcrvalue=0x04 | 0x0x38; /* big-endian, 256 burst length */ |
870 | np->bcrvalue = 0x04 | 0x10; /* big-endian, tx 8 burst length */ | 870 | np->bcrvalue = 0x04 | 0x10; /* big-endian, tx 8 burst length */ |
871 | np->crvalue = 0xe00; /* rx 128 burst length */ | 871 | np->crvalue = 0xe00; /* rx 128 burst length */ |
872 | #elif defined(__alpha__) || defined(__x86_64__) | 872 | #elif defined(__alpha__) || defined(__x86_64__) |
873 | // 89/9/1 modify, | 873 | // 89/9/1 modify, |
874 | // np->bcrvalue=0x38; /* little-endian, 256 burst length */ | 874 | // np->bcrvalue=0x38; /* little-endian, 256 burst length */ |
875 | np->bcrvalue = 0x10; /* little-endian, 8 burst length */ | 875 | np->bcrvalue = 0x10; /* little-endian, 8 burst length */ |
876 | np->crvalue = 0xe00; /* rx 128 burst length */ | 876 | np->crvalue = 0xe00; /* rx 128 burst length */ |
877 | #elif defined(__i386__) | 877 | #elif defined(__i386__) |
878 | #if defined(MODULE) | 878 | #if defined(MODULE) |
879 | // 89/9/1 modify, | 879 | // 89/9/1 modify, |
880 | // np->bcrvalue=0x38; /* little-endian, 256 burst length */ | 880 | // np->bcrvalue=0x38; /* little-endian, 256 burst length */ |
881 | np->bcrvalue = 0x10; /* little-endian, 8 burst length */ | 881 | np->bcrvalue = 0x10; /* little-endian, 8 burst length */ |
882 | np->crvalue = 0xe00; /* rx 128 burst length */ | 882 | np->crvalue = 0xe00; /* rx 128 burst length */ |
883 | #else | 883 | #else |
884 | /* When not a module we can work around broken '486 PCI boards. */ | 884 | /* When not a module we can work around broken '486 PCI boards. */ |
885 | #define x86 boot_cpu_data.x86 | 885 | #define x86 boot_cpu_data.x86 |
886 | // 89/9/1 modify, | 886 | // 89/9/1 modify, |
887 | // np->bcrvalue=(x86 <= 4 ? 0x10 : 0x38); | 887 | // np->bcrvalue=(x86 <= 4 ? 0x10 : 0x38); |
888 | np->bcrvalue = 0x10; | 888 | np->bcrvalue = 0x10; |
889 | np->crvalue = (x86 <= 4 ? 0xa00 : 0xe00); | 889 | np->crvalue = (x86 <= 4 ? 0xa00 : 0xe00); |
@@ -1160,7 +1160,7 @@ static void reset_and_disable_rxtx(struct net_device *dev) | |||
1160 | /* Reset the chip to erase previous misconfiguration. */ | 1160 | /* Reset the chip to erase previous misconfiguration. */ |
1161 | iowrite32(0x00000001, ioaddr + BCR); | 1161 | iowrite32(0x00000001, ioaddr + BCR); |
1162 | 1162 | ||
1163 | /* Ueimor: wait for 50 PCI cycles (and flush posted writes btw). | 1163 | /* Ueimor: wait for 50 PCI cycles (and flush posted writes btw). |
1164 | We surely wait too long (address+data phase). Who cares? */ | 1164 | We surely wait too long (address+data phase). Who cares? */ |
1165 | while (--delay) { | 1165 | while (--delay) { |
1166 | ioread32(ioaddr + BCR); | 1166 | ioread32(ioaddr + BCR); |
@@ -1213,7 +1213,7 @@ static void reset_timer(unsigned long data) | |||
1213 | reset_tx_descriptors(dev); */ | 1213 | reset_tx_descriptors(dev); */ |
1214 | enable_rxtx(dev); | 1214 | enable_rxtx(dev); |
1215 | netif_start_queue(dev); /* FIXME: or netif_wake_queue(dev); ? */ | 1215 | netif_start_queue(dev); /* FIXME: or netif_wake_queue(dev); ? */ |
1216 | 1216 | ||
1217 | np->reset_timer_armed = 0; | 1217 | np->reset_timer_armed = 0; |
1218 | 1218 | ||
1219 | spin_unlock_irqrestore(&np->lock, flags); | 1219 | spin_unlock_irqrestore(&np->lock, flags); |
@@ -1239,7 +1239,7 @@ static void tx_timeout(struct net_device *dev) | |||
1239 | printk(" %4.4x", np->tx_ring[i].status); | 1239 | printk(" %4.4x", np->tx_ring[i].status); |
1240 | printk("\n"); | 1240 | printk("\n"); |
1241 | } | 1241 | } |
1242 | 1242 | ||
1243 | spin_lock_irqsave(&np->lock, flags); | 1243 | spin_lock_irqsave(&np->lock, flags); |
1244 | 1244 | ||
1245 | reset_and_disable_rxtx(dev); | 1245 | reset_and_disable_rxtx(dev); |
@@ -1509,7 +1509,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs | |||
1509 | stop_nic_rx(ioaddr, np->crvalue); | 1509 | stop_nic_rx(ioaddr, np->crvalue); |
1510 | reset_rx_descriptors(dev); | 1510 | reset_rx_descriptors(dev); |
1511 | iowrite32(np->crvalue, ioaddr + TCRRCR); | 1511 | iowrite32(np->crvalue, ioaddr + TCRRCR); |
1512 | } | 1512 | } |
1513 | } | 1513 | } |
1514 | 1514 | ||
1515 | while (np->really_tx_count) { | 1515 | while (np->really_tx_count) { |
@@ -1571,7 +1571,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance, struct pt_regs *rgs | |||
1571 | } | 1571 | } |
1572 | num_tx++; | 1572 | num_tx++; |
1573 | } /* end of for loop */ | 1573 | } /* end of for loop */ |
1574 | 1574 | ||
1575 | if (num_tx && np->free_tx_count >= 2) | 1575 | if (num_tx && np->free_tx_count >= 2) |
1576 | netif_wake_queue(dev); | 1576 | netif_wake_queue(dev); |
1577 | 1577 | ||
@@ -1728,7 +1728,7 @@ static int netdev_rx(struct net_device *dev) | |||
1728 | /* Call copy + cksum if available. */ | 1728 | /* Call copy + cksum if available. */ |
1729 | 1729 | ||
1730 | #if ! defined(__alpha__) | 1730 | #if ! defined(__alpha__) |
1731 | eth_copy_and_sum(skb, | 1731 | eth_copy_and_sum(skb, |
1732 | np->cur_rx->skbuff->data, pkt_len, 0); | 1732 | np->cur_rx->skbuff->data, pkt_len, 0); |
1733 | skb_put(skb, pkt_len); | 1733 | skb_put(skb, pkt_len); |
1734 | #else | 1734 | #else |