mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-10-06 13:59:46 +03:00
[lantiq] fixes etop locking issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30689 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f8f3c2b274
commit
1863b32a32
@ -1,7 +1,7 @@
|
|||||||
Index: linux-3.1.10/drivers/net/lantiq_etop.c
|
Index: linux-3.1.10/drivers/net/lantiq_etop.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- linux-3.1.10.orig/drivers/net/lantiq_etop.c 2012-02-09 10:07:01.180680919 +0100
|
--- linux-3.1.10.orig/drivers/net/lantiq_etop.c 2012-02-23 09:06:47.274557678 +0100
|
||||||
+++ linux-3.1.10/drivers/net/lantiq_etop.c 2012-02-09 10:11:00.996691173 +0100
|
+++ linux-3.1.10/drivers/net/lantiq_etop.c 2012-02-23 09:07:03.006558044 +0100
|
||||||
@@ -203,8 +203,10 @@
|
@@ -203,8 +203,10 @@
|
||||||
{
|
{
|
||||||
struct ltq_etop_chan *ch = container_of(napi,
|
struct ltq_etop_chan *ch = container_of(napi,
|
||||||
@ -33,7 +33,7 @@ Index: linux-3.1.10/drivers/net/lantiq_etop.c
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -615,13 +621,17 @@
|
@@ -615,13 +621,16 @@
|
||||||
{
|
{
|
||||||
struct ltq_etop_priv *priv = netdev_priv(dev);
|
struct ltq_etop_priv *priv = netdev_priv(dev);
|
||||||
int i;
|
int i;
|
||||||
@ -46,12 +46,11 @@ Index: linux-3.1.10/drivers/net/lantiq_etop.c
|
|||||||
continue;
|
continue;
|
||||||
+ spin_lock_irqsave(&priv->lock, flags);
|
+ spin_lock_irqsave(&priv->lock, flags);
|
||||||
ltq_dma_open(&ch->dma);
|
ltq_dma_open(&ch->dma);
|
||||||
+ ltq_dma_ack_irq(&ch->dma);
|
|
||||||
+ spin_unlock_irqrestore(&priv->lock, flags);
|
+ spin_unlock_irqrestore(&priv->lock, flags);
|
||||||
napi_enable(&ch->napi);
|
napi_enable(&ch->napi);
|
||||||
}
|
}
|
||||||
if (priv->phydev)
|
if (priv->phydev)
|
||||||
@@ -635,6 +645,7 @@
|
@@ -635,6 +644,7 @@
|
||||||
{
|
{
|
||||||
struct ltq_etop_priv *priv = netdev_priv(dev);
|
struct ltq_etop_priv *priv = netdev_priv(dev);
|
||||||
int i;
|
int i;
|
||||||
@ -59,7 +58,7 @@ Index: linux-3.1.10/drivers/net/lantiq_etop.c
|
|||||||
|
|
||||||
netif_tx_stop_all_queues(dev);
|
netif_tx_stop_all_queues(dev);
|
||||||
if (priv->phydev)
|
if (priv->phydev)
|
||||||
@@ -645,7 +656,9 @@
|
@@ -645,7 +655,9 @@
|
||||||
if (!IS_RX(i) && !IS_TX(i))
|
if (!IS_RX(i) && !IS_TX(i))
|
||||||
continue;
|
continue;
|
||||||
napi_disable(&ch->napi);
|
napi_disable(&ch->napi);
|
||||||
|
Loading…
Reference in New Issue
Block a user