KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: ag71xx: store maximum frame length in the ag71xx struct

Browse source 
This will allow to use different values for the
different SoCs.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39117
This commit is contained in:
Gabor Juhos 2013-12-17 15:18:16 +00:00
parent ea89cc9250
commit 6072e777e9
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
View file

@ -168,6 +168,8 @@ struct ag71xx {
unsigned int speed; unsigned int speed;
int duplex; int duplex;
unsigned int max_frame_len;
struct work_struct restart_work; struct work_struct restart_work;
struct delayed_work link_work; struct delayed_work link_work;
struct timer_list oom_timer; struct timer_list oom_timer;

8
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View file

@ -434,7 +434,7 @@ static void ag71xx_hw_setup(struct ag71xx *ag)
MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK); MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
/* setup max frame length */ /* 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 */ /* setup FIFO configuration registers */
ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT); 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) static int ag71xx_change_mtu(struct net_device *dev, int new_mtu)
{ {
struct ag71xx *ag = netdev_priv(dev);
if (new_mtu < 68 || 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; return -EINVAL;
dev->mtu = new_mtu; 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->tx_ring.size = AG71XX_TX_RING_SIZE_DEFAULT;
ag->rx_ring.size = AG71XX_RX_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, ag->stop_desc = dma_alloc_coherent(NULL,
sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL); sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL);