equal
deleted
inserted
replaced
1481 |
1481 |
1482 if ((np->next_tx - np->nic_tx + entries - 1) > np->tx_limit_stop) { |
1482 if ((np->next_tx - np->nic_tx + entries - 1) > np->tx_limit_stop) { |
1483 spin_unlock_irq(&np->lock); |
1483 spin_unlock_irq(&np->lock); |
1484 netif_stop_queue(dev); |
1484 netif_stop_queue(dev); |
1485 return NETDEV_TX_BUSY; |
1485 return NETDEV_TX_BUSY; |
|
1486 } |
1486 } |
1487 } |
1487 |
1488 |
1488 /* setup the header buffer */ |
1489 /* setup the header buffer */ |
1489 do { |
1490 do { |
1490 bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size; |
1491 bcnt = (size > NV_TX2_TSO_MAX_SIZE) ? NV_TX2_TSO_MAX_SIZE : size; |
1822 * the performance. |
1823 * the performance. |
1823 */ |
1824 */ |
1824 pci_unmap_single(np->pci_dev, np->rx_dma[i], |
1825 pci_unmap_single(np->pci_dev, np->rx_dma[i], |
1825 np->rx_skbuff[i]->end-np->rx_skbuff[i]->data, |
1826 np->rx_skbuff[i]->end-np->rx_skbuff[i]->data, |
1826 PCI_DMA_FROMDEVICE); |
1827 PCI_DMA_FROMDEVICE); |
|
1828 |
1827 { |
1829 { |
1828 int j; |
1830 int j; |
1829 dprintk(KERN_DEBUG "Dumping packet (flags 0x%x).",flags); |
1831 dprintk(KERN_DEBUG "Dumping packet (flags 0x%x).",flags); |
1830 for (j=0; j<64; j++) { |
1832 for (j=0; j<64; j++) { |
1831 if ((j%16) == 0) |
1833 if ((j%16) == 0) |
2889 } |
2891 } |
2890 } |
2892 } |
2891 |
2893 |
2892 void ec_poll(struct net_device *dev) |
2894 void ec_poll(struct net_device *dev) |
2893 { |
2895 { |
2894 nv_nic_irq((int) 0, dev, (struct pt_regs *) NULL); |
2896 nv_nic_irq(0, dev); |
2895 } |
2897 } |
2896 |
2898 |
2897 static void nv_do_nic_poll(unsigned long data) |
2899 static void nv_do_nic_poll(unsigned long data) |
2898 { |
2900 { |
2899 struct net_device *dev = (struct net_device *) data; |
2901 struct net_device *dev = (struct net_device *) data; |