diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-09-27 18:09:45 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-09-27 18:09:45 +0200 |
| commit | 8922c9b4b2e3b1b845b46e8da61ad228d8f1b121 (patch) | |
| tree | 0342521aa22e175a1c22c38f005ec7fd2037ff99 /drivers | |
| parent | 73d155b304575435cd9f6deeb93fbd4d2a6cc9af (diff) | |
| parent | 22df90f6bb687db58298084a200782dd0148d247 (diff) | |
| download | linux-8922c9b4b2e3b1b845b46e8da61ad228d8f1b121.tar.gz linux-8922c9b4b2e3b1b845b46e8da61ad228d8f1b121.tar.bz2 linux-8922c9b4b2e3b1b845b46e8da61ad228d8f1b121.zip | |
Merge branch 'broadcom' of git://dev.phrozen.org/mips-next into mips-for-linux-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 0e3048b788c2..133d5857b9e2 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h @@ -10,6 +10,7 @@ #include <bcm63xx_regs.h> #include <bcm63xx_irq.h> #include <bcm63xx_io.h> +#include <bcm63xx_iudma.h> /* default number of descriptor */ #define BCMENET_DEF_RX_DESC 64 @@ -31,35 +32,6 @@ #define BCMENET_MAX_MTU 2046 /* - * rx/tx dma descriptor - */ -struct bcm_enet_desc { - u32 len_stat; - u32 address; -}; - -#define DMADESC_LENGTH_SHIFT 16 -#define DMADESC_LENGTH_MASK (0xfff << DMADESC_LENGTH_SHIFT) -#define DMADESC_OWNER_MASK (1 << 15) -#define DMADESC_EOP_MASK (1 << 14) -#define DMADESC_SOP_MASK (1 << 13) -#define DMADESC_ESOP_MASK (DMADESC_EOP_MASK | DMADESC_SOP_MASK) -#define DMADESC_WRAP_MASK (1 << 12) - -#define DMADESC_UNDER_MASK (1 << 9) -#define DMADESC_APPEND_CRC (1 << 8) -#define DMADESC_OVSIZE_MASK (1 << 4) -#define DMADESC_RXER_MASK (1 << 2) -#define DMADESC_CRC_MASK (1 << 1) -#define DMADESC_OV_MASK (1 << 0) -#define DMADESC_ERR_MASK (DMADESC_UNDER_MASK | \ - DMADESC_OVSIZE_MASK | \ - DMADESC_RXER_MASK | \ - DMADESC_CRC_MASK | \ - DMADESC_OV_MASK) - - -/* * MIB Counters register definitions */ #define ETH_MIB_TX_GD_OCTETS 0 |