diff --git a/[refs] b/[refs] index 2f3edade69d1..cb3383cc5795 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60b677034fcb3e48ffa30d638b09ac925afb4b36 +refs/heads/master: 2fb83cd618be34546fb526a9051eceaa95517026 diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c index b78be088c4ad..8f8b65af9ed5 100644 --- a/trunk/drivers/net/natsemi.c +++ b/trunk/drivers/net/natsemi.c @@ -2360,7 +2360,8 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do) PCI_DMA_FROMDEVICE); } else { pci_unmap_single(np->pci_dev, np->rx_dma[entry], - buflen, PCI_DMA_FROMDEVICE); + buflen + NATSEMI_PADDING, + PCI_DMA_FROMDEVICE); skb_put(skb = np->rx_skbuff[entry], pkt_len); np->rx_skbuff[entry] = NULL; }