Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184280
b: refs/heads/master
c: c3b7c12
h: refs/heads/master
v: v3
  • Loading branch information
Steven J. Magnani authored and David S. Miller committed Feb 17, 2010
1 parent 9e927a3 commit a757474
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e1d444771e0895c7706bc99857d69e4f2a58a531
refs/heads/master: c3b7c12cd78d5c8264c87c29dcd9a8f1819f8313
5 changes: 4 additions & 1 deletion trunk/drivers/net/ll_temac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ static void ll_temac_recv(struct net_device *ndev)
while ((bdstat & STS_CTRL_APP0_CMPLT)) {

skb = lp->rx_skb[lp->rx_bd_ci];
length = cur_p->app4;
length = cur_p->app4 & 0x3FFF;

skb_vaddr = virt_to_bus(skb->data);
dma_unmap_single(ndev->dev.parent, skb_vaddr, length,
Expand Down Expand Up @@ -938,6 +938,9 @@ static int __devexit temac_of_remove(struct of_device *op)

static struct of_device_id temac_of_match[] __devinitdata = {
{ .compatible = "xlnx,xps-ll-temac-1.01.b", },
{ .compatible = "xlnx,xps-ll-temac-2.00.a", },
{ .compatible = "xlnx,xps-ll-temac-2.02.a", },
{ .compatible = "xlnx,xps-ll-temac-2.03.a", },
{},
};
MODULE_DEVICE_TABLE(of, temac_of_match);
Expand Down

0 comments on commit a757474

Please sign in to comment.