Skip to content

Commit

Permalink
ll_temac: Add support for V2 LLTEMAC core
Browse files Browse the repository at this point in the history
LLTEMAC V1 cores place only received packet length in the app4 word.
V2 cores place additional information in app4.
Mask out the additional information when retrieving the packet length.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Steven J. Magnani authored and David S. Miller committed Feb 17, 2010
1 parent e1d4447 commit c3b7c12
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion 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 c3b7c12

Please sign in to comment.