Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / drivers / net / eepro100.c

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index db658bc491a9c5ddd6c29b97689d14a24267a94f..9800341956a2e36a1277e9f9830547abdbc737ba 100644 (file)
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -28,7 +28,7 @@
 */
 
 static const char * const version =
-"eepro100.c:v1.09j-t 9/29/99 Donald Becker http://www.scyld.com/network/eepro100.html\n"
+"eepro100.c:v1.09j-t 9/29/99 Donald Becker\n"
 "eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n";
 
 /* A few user-configurable values that apply to all boards.
@@ -1804,8 +1804,9 @@ speedo_rx(struct net_device *dev)
                                eth_copy_and_sum(skb, sp->rx_skbuff[entry]->data, pkt_len, 0);
                                skb_put(skb, pkt_len);
 #else
-                               memcpy(skb_put(skb, pkt_len), sp->rx_skbuff[entry]->data,
-                                          pkt_len);
+                               skb_copy_from_linear_data(sp->rx_skbuff[entry],
+                                                         skb_put(skb, pkt_len),
+                                                         pkt_len);
 #endif
                                pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[entry],
                                                                                           sizeof(struct RxFD) + pkt_len,