diff options
| author |   Joachim Eastwood <manabian@gmail.com> | 2012-10-18 11:01:16 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-10-19 13:18:29 -0400 |
| commit | fbb7a6e7d4ee2139405957a131623815060cb966 (patch) | |
| tree | 3178597641f9f09f23def8ed45982d6f3bbec357 | |
| parent | e0da1f144abd34b3e29fe0ba871fee2c57b991c6 (diff) | |
net/at91_ether: use macb dma description struct
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
| -rw-r--r-- | drivers/net/ethernet/cadence/at91_ether.c | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/cadence/macb.h | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index f340d248e79..8204b8abc33 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c @@ -157,7 +157,7 @@ static void at91ether_start(struct net_device *dev) for (i = 0; i < MAX_RX_DESCR; i++) { dlist->descriptors[i].addr = (unsigned int) &dlist_phys->recv_buf[i][0]; - dlist->descriptors[i].size = 0; + dlist->descriptors[i].ctrl = 0; } /* Set the Wrap bit on the last descriptor */ @@ -311,7 +311,7 @@ static void at91ether_rx(struct net_device *dev) dlist = lp->dlist; while (dlist->descriptors[lp->rxBuffIndex].addr & MACB_BIT(RX_USED)) { p_recv = dlist->recv_buf[lp->rxBuffIndex]; - pktlen = dlist->descriptors[lp->rxBuffIndex].size & 0x7ff; /* Length of frame including FCS */ + pktlen = dlist->descriptors[lp->rxBuffIndex].ctrl & 0x7ff; /* Length of frame including FCS */ skb = netdev_alloc_skb(dev, pktlen + 2); if (skb != NULL) { skb_reserve(skb, 2); @@ -326,7 +326,7 @@ static void at91ether_rx(struct net_device *dev) printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name); } - if (dlist->descriptors[lp->rxBuffIndex].size & MACB_BIT(RX_MHASH_MATCH)) + if (dlist->descriptors[lp->rxBuffIndex].ctrl & MACB_BIT(RX_MHASH_MATCH)) dev->stats.multicast++; dlist->descriptors[lp->rxBuffIndex].addr &= ~MACB_BIT(RX_USED); /* reset ownership bit */ diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index 2710562e5b6..31a877a2053 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -504,16 +504,11 @@ struct gem_stats { u32 rx_udp_checksum_errors; }; -struct rbf_t { - unsigned int addr; - unsigned long size; -}; - #define MAX_RBUFF_SZ 0x600 /* 1518 rounded up */ #define MAX_RX_DESCR 9 /* max number of receive buffers */ struct recv_desc_bufs { - struct rbf_t descriptors[MAX_RX_DESCR]; /* must be on sizeof (rbf_t) boundary */ + struct dma_desc descriptors[MAX_RX_DESCR]; /* must be on sizeof (dma_desc) boundary */ char recv_buf[MAX_RX_DESCR][MAX_RBUFF_SZ]; /* must be on long boundary */ }; |