diff options
Diffstat (limited to 'drivers/net/eepro100.c')
| -rw-r--r-- | drivers/net/eepro100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index e28bb1e38f8d..6c267c38df97 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c | |||
| @@ -1793,7 +1793,6 @@ speedo_rx(struct net_device *dev) | |||
| 1793 | copying to a properly sized skbuff. */ | 1793 | copying to a properly sized skbuff. */ |
| 1794 | if (pkt_len < rx_copybreak | 1794 | if (pkt_len < rx_copybreak |
| 1795 | && (skb = dev_alloc_skb(pkt_len + 2)) != 0) { | 1795 | && (skb = dev_alloc_skb(pkt_len + 2)) != 0) { |
| 1796 | skb->dev = dev; | ||
| 1797 | skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ | 1796 | skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ |
| 1798 | /* 'skb_put()' points to the start of sk_buff data area. */ | 1797 | /* 'skb_put()' points to the start of sk_buff data area. */ |
| 1799 | pci_dma_sync_single_for_cpu(sp->pdev, sp->rx_ring_dma[entry], | 1798 | pci_dma_sync_single_for_cpu(sp->pdev, sp->rx_ring_dma[entry], |
| @@ -1805,8 +1804,9 @@ speedo_rx(struct net_device *dev) | |||
| 1805 | eth_copy_and_sum(skb, sp->rx_skbuff[entry]->data, pkt_len, 0); | 1804 | eth_copy_and_sum(skb, sp->rx_skbuff[entry]->data, pkt_len, 0); |
| 1806 | skb_put(skb, pkt_len); | 1805 | skb_put(skb, pkt_len); |
| 1807 | #else | 1806 | #else |
| 1808 | memcpy(skb_put(skb, pkt_len), sp->rx_skbuff[entry]->data, | 1807 | skb_copy_from_linear_data(sp->rx_skbuff[entry], |
| 1809 | pkt_len); | 1808 | skb_put(skb, pkt_len), |
| 1809 | pkt_len); | ||
| 1810 | #endif | 1810 | #endif |
| 1811 | pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[entry], | 1811 | pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[entry], |
| 1812 | sizeof(struct RxFD) + pkt_len, | 1812 | sizeof(struct RxFD) + pkt_len, |