diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-04-13 16:21:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-14 07:49:50 -0400 |
commit | 56b106ae7b1f6b7cef4ef7e79a03b59cfc940923 (patch) | |
tree | 3bf4908dd7a31231480f7f7289e6660b49bd41e3 /drivers/net/stmmac/common.h | |
parent | 3c32be635c18ead00d460b7bdad1da52622ff40f (diff) |
stmmac: rework normal and enhanced descriptors
Currently the driver assumes that the mac10/100 can only use the
normal descriptor structure and the gmac can only use the
enhanced structures.
This patch removes the descriptor's code from the dma files
and adds two new files just for handling the normal and enhanced
descriptors.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/stmmac/common.h')
-rw-r--r-- | drivers/net/stmmac/common.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/net/stmmac/common.h b/drivers/net/stmmac/common.h index 2a58172e986a..bd3b78510706 100644 --- a/drivers/net/stmmac/common.h +++ b/drivers/net/stmmac/common.h | |||
@@ -22,8 +22,21 @@ | |||
22 | Author: Giuseppe Cavallaro <peppe.cavallaro@st.com> | 22 | Author: Giuseppe Cavallaro <peppe.cavallaro@st.com> |
23 | *******************************************************************************/ | 23 | *******************************************************************************/ |
24 | 24 | ||
25 | #include "descs.h" | ||
26 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
26 | #include "descs.h" | ||
27 | |||
28 | #undef CHIP_DEBUG_PRINT | ||
29 | /* Turn-on extra printk debug for MAC core, dma and descriptors */ | ||
30 | /* #define CHIP_DEBUG_PRINT */ | ||
31 | |||
32 | #ifdef CHIP_DEBUG_PRINT | ||
33 | #define CHIP_DBG(fmt, args...) printk(fmt, ## args) | ||
34 | #else | ||
35 | #define CHIP_DBG(fmt, args...) do { } while (0) | ||
36 | #endif | ||
37 | |||
38 | #undef FRAME_FILTER_DEBUG | ||
39 | /* #define FRAME_FILTER_DEBUG */ | ||
27 | 40 | ||
28 | struct stmmac_extra_stats { | 41 | struct stmmac_extra_stats { |
29 | /* Transmit errors */ | 42 | /* Transmit errors */ |