diff options
author | John Crispin <john@openwrt.org> | 2010-05-17 10:06:46 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2010-05-17 10:06:46 +0000 |
commit | c8f606c7601dd8a00120ebf8e3b06ec3bfe59efd (patch) | |
tree | dc0f82060a04859c59ba6de1efb84303dcbd9232 /target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c | |
parent | b12999bdbe2d0134103f6ca7bec25a5feb6e7712 (diff) | |
download | upstream-c8f606c7601dd8a00120ebf8e3b06ec3bfe59efd.tar.gz upstream-c8f606c7601dd8a00120ebf8e3b06ec3bfe59efd.tar.bz2 upstream-c8f606c7601dd8a00120ebf8e3b06ec3bfe59efd.zip |
* adds support for speedport w502V
* bump kernel to 2.6.33.4
* make ethernet be configurable as MII/RMII
* on xway we now assign a static amount of cp1 ram (still need to find a
sane value)
* remove bogus board.c
* jiffies were running with a (1 << 2) multiplier
SVN-Revision: 21485
Diffstat (limited to 'target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c')
-rw-r--r-- | target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c b/target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c index e6d0d9615f..4c618352dd 100644 --- a/target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c +++ b/target/linux/ifxmips/files-2.6.33/drivers/net/ifxmips.c @@ -41,6 +41,7 @@ #include <ifxmips.h> #include <ifxmips_dma.h> #include <ifxmips_pmu.h> +#include <ifxmips_platform.h> struct ifxmips_mii_priv { struct net_device_stats stats; @@ -267,11 +268,6 @@ void ifxmips_etop_dma_buffer_free(unsigned char *dataptr, void *opt) } } -static struct net_device_stats *ifxmips_get_stats(struct net_device *dev) -{ - return &((struct ifxmips_mii_priv *)netdev_priv(dev))->stats; -} - static void ifxmips_adjust_link(struct net_device *dev) { @@ -436,12 +432,12 @@ static int ifxmips_mii_probe(struct platform_device *dev) { int result = 0; - unsigned char *mac = (unsigned char *)dev->dev.platform_data; + struct ifxmips_eth_data *eth = (struct ifxmips_eth_data*)dev->dev.platform_data; ifxmips_mii0_dev = alloc_etherdev(sizeof(struct ifxmips_mii_priv)); ifxmips_mii0_dev->netdev_ops = &ifxmips_eth_netdev_ops; - memcpy(mac_addr, mac, 6); + memcpy(mac_addr, eth->mac, 6); strcpy(ifxmips_mii0_dev->name, "eth%d"); - ifxmips_mii_chip_init(REV_MII_MODE); + ifxmips_mii_chip_init(eth->mii_mode); result = register_netdev(ifxmips_mii0_dev); if (result) { printk(KERN_INFO "ifxmips_mii0: error %i registering device \"%s\"\n", result, ifxmips_mii0_dev->name); |