diff options
| author | John Crispin <blogic@openwrt.org> | 2012-02-23 07:42:00 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2012-02-23 07:42:00 +0000 |
| commit | f3ef4a04f7d6171815441770c8bfe93b2157c0a3 (patch) | |
| tree | 6b737a81ff13aac835f57e2cd054a75615293eaf /target/linux/lantiq | |
| parent | 3b75f78469a7e86ec3c809d7a0fb41fd6e15be20 (diff) | |
| download | upstream-f3ef4a04f7d6171815441770c8bfe93b2157c0a3.tar.gz upstream-f3ef4a04f7d6171815441770c8bfe93b2157c0a3.tar.bz2 upstream-f3ef4a04f7d6171815441770c8bfe93b2157c0a3.zip | |
[lantiq] fixes etop locking issue
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30689 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches/850-etop_irq.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches/850-etop_irq.patch b/target/linux/lantiq/patches/850-etop_irq.patch index d0b86451d7..bc868f8187 100644 --- a/target/linux/lantiq/patches/850-etop_irq.patch +++ b/target/linux/lantiq/patches/850-etop_irq.patch @@ -1,7 +1,7 @@ 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/drivers/net/lantiq_etop.c 2012-02-09 10:11:00.996691173 +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-23 09:07:03.006558044 +0100 @@ -203,8 +203,10 @@ { struct ltq_etop_chan *ch = container_of(napi, @@ -33,7 +33,7 @@ Index: linux-3.1.10/drivers/net/lantiq_etop.c return 1; } -@@ -615,13 +621,17 @@ +@@ -615,13 +621,16 @@ { struct ltq_etop_priv *priv = netdev_priv(dev); int i; @@ -46,12 +46,11 @@ Index: linux-3.1.10/drivers/net/lantiq_etop.c continue; + spin_lock_irqsave(&priv->lock, flags); ltq_dma_open(&ch->dma); -+ ltq_dma_ack_irq(&ch->dma); + spin_unlock_irqrestore(&priv->lock, flags); napi_enable(&ch->napi); } if (priv->phydev) -@@ -635,6 +645,7 @@ +@@ -635,6 +644,7 @@ { struct ltq_etop_priv *priv = netdev_priv(dev); int i; @@ -59,7 +58,7 @@ Index: linux-3.1.10/drivers/net/lantiq_etop.c netif_tx_stop_all_queues(dev); if (priv->phydev) -@@ -645,7 +656,9 @@ +@@ -645,7 +655,9 @@ if (!IS_RX(i) && !IS_TX(i)) continue; napi_disable(&ch->napi); |