Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / drivers / net / yellowfin.c

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 81e9794..ef0c797 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -448,7 +448,7 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
 
        np = dev->priv;
 
-       if (pci_request_regions(pdev, dev->name))
+       if (pci_request_regions(pdev, DRV_NAME))
                goto err_out_free_netdev;
 
        pci_set_master (pdev);
@@ -1201,13 +1201,8 @@ static int yellowfin_rx(struct net_device *dev)
                                        break;
                                skb->dev = dev;
                                skb_reserve(skb, 2);    /* 16 byte align the IP header */
-#if HAS_IP_COPYSUM
                                eth_copy_and_sum(skb, rx_skb->tail, pkt_len, 0);
                                skb_put(skb, pkt_len);
-#else
-                               memcpy(skb_put(skb, pkt_len), 
-                                       rx_skb->tail, pkt_len);
-#endif
                                pci_dma_sync_single_for_device(yp->pci_dev, desc->addr,
                                                                                           yp->rx_buf_sz,
                                                                                           PCI_DMA_FROMDEVICE);