diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 10:20:10 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 10:20:10 +0100 |
| commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
| tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /drivers/net/dl2k.c | |
| parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/dl2k.c')
| -rw-r--r-- | drivers/net/dl2k.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c index 74ec64a1625..04e3710c908 100644 --- a/drivers/net/dl2k.c +++ b/drivers/net/dl2k.c @@ -250,7 +250,6 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent) np->an_enable = 1; mii_set_media (dev); } - pci_read_config_byte(pdev, PCI_REVISION_ID, &np->pci_rev_id); err = register_netdev (dev); if (err) @@ -866,9 +865,9 @@ receive_packet (struct net_device *dev) PCI_DMA_FROMDEVICE); /* 16 byte align the IP header */ skb_reserve (skb, 2); - eth_copy_and_sum (skb, + skb_copy_to_linear_data (skb, np->rx_skbuff[entry]->data, - pkt_len, 0); + pkt_len); skb_put (skb, pkt_len); pci_dma_sync_single_for_device(np->pdev, desc->fraginfo & @@ -879,7 +878,7 @@ receive_packet (struct net_device *dev) skb->protocol = eth_type_trans (skb, dev); #if 0 /* Checksum done by hw, but csum value unavailable. */ - if (np->pci_rev_id >= 0x0c && + if (np->pdev->pci_rev_id >= 0x0c && !(frame_status & (TCPError | UDPError | IPError))) { skb->ip_summed = CHECKSUM_UNNECESSARY; } |