diff --git a/[refs] b/[refs] index b079a1659c1e..814e1a354857 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd5a93462093305a9ea7abd888a16c8c83e4bdc2 +refs/heads/master: 5125a786680df0d6d31aad53bc23e19f51a30509 diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c index 1d7efa2b6cbc..6a6329e64123 100644 --- a/trunk/drivers/net/r6040.c +++ b/trunk/drivers/net/r6040.c @@ -260,7 +260,7 @@ static void rx_buf_alloc(struct r6040_private *lp, struct net_device *dev) if (!descptr->skb_ptr) break; descptr->buf = cpu_to_le32(pci_map_single(lp->pdev, - descptr->skb_ptr->tail, + descptr->skb_ptr->data, MAX_BUF_SIZE, PCI_DMA_FROMDEVICE)); descptr->status = 0x8000; descptr = descptr->vndescp;