From c4cd917a49c524c1752eff2e243f454d674c6166 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 17 Dec 2013 15:18:16 +0000 Subject: ar71xx: ag71xx: store maximum frame length in the ag71xx struct This will allow to use different values for the different SoCs. Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39117 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c') 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 0c2163f5be..281d0f5686 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 @@ -434,7 +434,7 @@ static void ag71xx_hw_setup(struct ag71xx *ag) MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK); /* setup max frame length */ - ag71xx_wr(ag, AG71XX_REG_MAC_MFL, AG71XX_TX_MTU_LEN); + ag71xx_wr(ag, AG71XX_REG_MAC_MFL, ag->max_frame_len); /* setup FIFO configuration registers */ ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT); @@ -1048,8 +1048,10 @@ static void ag71xx_netpoll(struct net_device *dev) static int ag71xx_change_mtu(struct net_device *dev, int new_mtu) { + struct ag71xx *ag = netdev_priv(dev); + if (new_mtu < 68 || - new_mtu > AG71XX_TX_MTU_LEN - ETH_HLEN - ETH_FCS_LEN) + new_mtu > ag->max_frame_len - ETH_HLEN - ETH_FCS_LEN) return -EINVAL; dev->mtu = new_mtu; @@ -1164,6 +1166,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->stop_desc = dma_alloc_coherent(NULL, sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL); -- cgit v1.2.3