diff options
| author |   Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-04-13 20:21:12 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-04-14 04:49:50 -0700 |
| commit | 56b106ae7b1f6b7cef4ef7e79a03b59cfc940923 (patch) | |
| tree | 3bf4908dd7a31231480f7f7289e6660b49bd41e3 /drivers/net/stmmac/dwmac100_core.c | |
| parent | stmmac: split core and dma for the mac10/100 (diff) | |
| download | linux-dev-56b106ae7b1f6b7cef4ef7e79a03b59cfc940923.tar.xz linux-dev-56b106ae7b1f6b7cef4ef7e79a03b59cfc940923.zip | |
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/dwmac100_core.c')
| -rw-r--r-- | drivers/net/stmmac/dwmac100_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/stmmac/dwmac100_core.c index 8ecb8c0b4d98..fab14a4cb14c 100644 --- a/drivers/net/stmmac/dwmac100_core.c +++ b/drivers/net/stmmac/dwmac100_core.c @@ -141,7 +141,7 @@ static void dwmac100_set_filter(struct net_device *dev) writel(value, ioaddr + MAC_CONTROL); - DBG(KERN_INFO "%s: CTRL reg: 0x%08x Hash regs: " + CHIP_DBG(KERN_INFO "%s: CTRL reg: 0x%08x Hash regs: " "HI 0x%08x, LO 0x%08x\n", __func__, readl(ioaddr + MAC_CONTROL), readl(ioaddr + MAC_HASH_HIGH), readl(ioaddr + MAC_HASH_LOW)); @@ -188,7 +188,6 @@ struct mac_device_info *dwmac100_setup(unsigned long ioaddr) pr_info("\tDWMAC100\n"); mac->mac = &dwmac100_ops; - mac->desc = &dwmac100_desc_ops; mac->dma = &dwmac100_dma_ops; mac->pmt = PMT_NOT_SUPPORTED; |