diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-12-20 11:41:17 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-12-20 11:41:17 +0000 |
| commit | 2c4e3cf33a67dd40f34171141f44dde55b8a55ff (patch) | |
| tree | 989fd2d8dfc1ecff0484046b792617a1a1f130cf /target/linux | |
| parent | 9be1e508f98abad12d099b26e2087c5e95fe2d64 (diff) | |
| download | upstream-2c4e3cf33a67dd40f34171141f44dde55b8a55ff.tar.gz upstream-2c4e3cf33a67dd40f34171141f44dde55b8a55ff.tar.bz2 upstream-2c4e3cf33a67dd40f34171141f44dde55b8a55ff.zip | |
ar71xx: ag71xx: get max_frame_len and desc_pktlen_mask from platform data
This will allow to use SoC specific values for both.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 39145
Diffstat (limited to 'target/linux')
3 files changed, 11 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c index 742218bb32..8b54d0c817 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c @@ -786,6 +786,9 @@ void __init ath79_register_eth(unsigned int id) pdata = pdev->dev.platform_data; + pdata->max_frame_len = 1540; + pdata->desc_pktlen_mask = 0xfff; + err = ath79_setup_phy_if_mode(id, pdata); if (err) { printk(KERN_ERR diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h index 68aea202bd..d46dc4e317 100644 --- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h +++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ath79/ag71xx_platform.h @@ -45,6 +45,9 @@ struct ag71xx_platform_data { u32 fifo_cfg1; u32 fifo_cfg2; u32 fifo_cfg3; + + unsigned int max_frame_len; + unsigned int desc_pktlen_mask; }; struct ag71xx_mdio_platform_data { diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index a129a6f291..9df27ff1a9 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -1124,6 +1124,9 @@ static int ag71xx_probe(struct platform_device *pdev) goto err_out; } + if (!pdata->max_frame_len || !pdata->desc_pktlen_mask) + return -EINVAL; + SET_NETDEV_DEV(dev, &pdev->dev); ag = netdev_priv(dev); @@ -1169,8 +1172,8 @@ static int ag71xx_probe(struct platform_device *pdev) ag->tx_ring.size = AG71XX_TX_RING_SIZE_DEFAULT; ag->rx_ring.size = AG71XX_RX_RING_SIZE_DEFAULT; - ag->max_frame_len = AG71XX_TX_MTU_LEN; - ag->desc_pktlen_mask = DESC_PKTLEN_MASK; + ag->max_frame_len = pdata->max_frame_len; + ag->desc_pktlen_mask = pdata->desc_pktlen_mask; ag->stop_desc = dma_alloc_coherent(NULL, sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL); |