net/at91_ether: use macb dma description struct

Signed-off-by: Joachim Eastwood <manabian@gmail.com>

diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index f340d248e792d2ce32ed7f98bb47c335591a14ab..8204b8abc3355943bc08c0119c074d6c48af21ab 100644 (file)
--- 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 2710562e5b64386db86af498b09161c8483b61a2..31a877a205369a89d763a1d181dde9d0b776cf31 100644 (file)
--- 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 */
 };