]> err.no Git - linux-2.6/commitdiff
[PATCH] winbond-840-remove-badness-in-pci_map_single
authorErling A. Jacobsen <linuxcub@email.dk>
Sun, 30 Apr 2006 19:46:56 +0000 (21:46 +0200)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:20:29 +0000 (00:20 -0400)
Call pci_map_single() with the actual size of the receive
buffers, not 0 (which skb->len is initialized to by dev_alloc_skb()).

Signed-off-by: Erling A. Jacobsen <linuxcub@email.dk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/tulip/winbond-840.c

index ba05dedf29d3396fa08d30c15c240535e6d64b6d..136a70c4d5e4880c442cfd75bf5f6450a621cfb9 100644 (file)
@@ -850,7 +850,7 @@ static void init_rxtx_rings(struct net_device *dev)
                        break;
                skb->dev = dev;                 /* Mark as being used by this device. */
                np->rx_addr[i] = pci_map_single(np->pci_dev,skb->data,
-                                       skb->len,PCI_DMA_FROMDEVICE);
+                                       np->rx_buf_sz,PCI_DMA_FROMDEVICE);
 
                np->rx_ring[i].buffer1 = np->rx_addr[i];
                np->rx_ring[i].status = DescOwn;
@@ -1316,7 +1316,7 @@ static int netdev_rx(struct net_device *dev)
                        skb->dev = dev;                 /* Mark as being used by this device. */
                        np->rx_addr[entry] = pci_map_single(np->pci_dev,
                                                        skb->data,
-                                                       skb->len, PCI_DMA_FROMDEVICE);
+                                                       np->rx_buf_sz, PCI_DMA_FROMDEVICE);
                        np->rx_ring[entry].buffer1 = np->rx_addr[entry];
                }
                wmb();