From a75747465d1c5112e29842a5ee6d6b224b9d0064 Mon Sep 17 00:00:00 2001 From: "Steven J. Magnani" Date: Wed, 17 Feb 2010 07:14:20 +0000 Subject: [PATCH] --- yaml --- r: 184280 b: refs/heads/master c: c3b7c12cd78d5c8264c87c29dcd9a8f1819f8313 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ll_temac_main.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 05be6c5bd9b3..3a76cd1039d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1d444771e0895c7706bc99857d69e4f2a58a531 +refs/heads/master: c3b7c12cd78d5c8264c87c29dcd9a8f1819f8313 diff --git a/trunk/drivers/net/ll_temac_main.c b/trunk/drivers/net/ll_temac_main.c index 8442c47e93e8..d7eb24cc2648 100644 --- a/trunk/drivers/net/ll_temac_main.c +++ b/trunk/drivers/net/ll_temac_main.c @@ -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, @@ -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);