diff --git a/[refs] b/[refs]
index 619b9f46ab62..3eade49e739a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd4fcc704f30f2064ab30b5300d44d431e46db50
+refs/heads/master: ff1817749f0405c019420fcb415ad20fedec7884
diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c
index 1f0a8333fd5c..60f46bc2bf64 100644
--- a/trunk/drivers/net/natsemi.c
+++ b/trunk/drivers/net/natsemi.c
@@ -2028,8 +2028,8 @@ static void drain_rx(struct net_device *dev)
 		np->rx_ring[i].cmd_status = 0;
 		np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */
 		if (np->rx_skbuff[i]) {
-			pci_unmap_single(np->pci_dev,
-				np->rx_dma[i], buflen,
+			pci_unmap_single(np->pci_dev, np->rx_dma[i],
+				buflen + NATSEMI_PADDING,
 				PCI_DMA_FROMDEVICE);
 			dev_kfree_skb(np->rx_skbuff[i]);
 		}