X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2adda3cec6b01b487d89bb5a5473d4d67622c7f4..e018221576d72be038cd4e03e0d7bc0bf39e5341:/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c index a0af8aaa6..eae443e8c 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -574,16 +574,12 @@ static void ag71xx_hw_stop(struct ag71xx *ag) static int ag71xx_open(struct net_device *dev) { struct ag71xx *ag = netdev_priv(dev); - struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); int ret; ret = ag71xx_rings_init(ag); if (ret) goto err; - if (pdata->is_ar724x) - ag71xx_hw_init(ag); - napi_enable(&ag->napi); netif_carrier_off(dev); @@ -747,8 +743,13 @@ static void ag71xx_tx_timeout(struct net_device *dev) static void ag71xx_restart_work_func(struct work_struct *work) { struct ag71xx *ag = container_of(work, struct ag71xx, restart_work); + struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); ag71xx_stop(ag->dev); + + if (pdata->is_ar724x) + ag71xx_hw_init(ag); + ag71xx_open(ag->dev); } @@ -1058,7 +1059,7 @@ static int __devinit ag71xx_probe(struct platform_device *pdev) dev->irq = platform_get_irq(pdev, 0); err = request_irq(dev->irq, ag71xx_interrupt, - IRQF_DISABLED | IRQF_SAMPLE_RANDOM, + IRQF_DISABLED, dev->name, dev); if (err) { dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);