summaryrefslogtreecommitdiff
path: root/target/linux/lantiq/patches/850-etop_irq.patch
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-25 08:50:09 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-25 08:50:09 +0000
commit4c8d6ad4d00835073b97d6bacdc119a58ac22350 (patch)
treefcbc09d1188b157091e186d10871e28abf340864 /target/linux/lantiq/patches/850-etop_irq.patch
parentbdd85a2ede796789cc19239466d5e3b06f329dc7 (diff)
[lantiq] bump kernel to 3.2.12
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31060 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches/850-etop_irq.patch')
-rw-r--r--target/linux/lantiq/patches/850-etop_irq.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/target/linux/lantiq/patches/850-etop_irq.patch b/target/linux/lantiq/patches/850-etop_irq.patch
deleted file mode 100644
index bc868f8187..0000000000
--- a/target/linux/lantiq/patches/850-etop_irq.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: linux-3.1.10/drivers/net/lantiq_etop.c
-===================================================================
---- 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,
- struct ltq_etop_chan, napi);
-+ struct ltq_etop_priv *priv = netdev_priv(ch->netdev);
- int rx = 0;
- int complete = 0;
-+ unsigned long flags;
-
- while ((rx < budget) && !complete) {
- struct ltq_dma_desc *desc = &ch->dma.desc_base[ch->dma.desc];
-@@ -218,7 +220,9 @@
- }
- if (complete || !rx) {
- napi_complete(&ch->napi);
-+ spin_lock_irqsave(&priv->lock, flags);
- ltq_dma_ack_irq(&ch->dma);
-+ spin_unlock_irqrestore(&priv->lock, flags);
- }
- return rx;
- }
-@@ -248,7 +252,9 @@
- if (netif_tx_queue_stopped(txq))
- netif_tx_start_queue(txq);
- napi_complete(&ch->napi);
-+ spin_lock_irqsave(&priv->lock, flags);
- ltq_dma_ack_irq(&ch->dma);
-+ spin_unlock_irqrestore(&priv->lock, flags);
- return 1;
- }
-
-@@ -615,13 +621,16 @@
- {
- struct ltq_etop_priv *priv = netdev_priv(dev);
- int i;
-+ unsigned long flags;
-
- for (i = 0; i < MAX_DMA_CHAN; i++) {
- struct ltq_etop_chan *ch = &priv->ch[i];
-
- if (!IS_TX(i) && (!IS_RX(i)))
- continue;
-+ spin_lock_irqsave(&priv->lock, flags);
- ltq_dma_open(&ch->dma);
-+ spin_unlock_irqrestore(&priv->lock, flags);
- napi_enable(&ch->napi);
- }
- if (priv->phydev)
-@@ -635,6 +644,7 @@
- {
- struct ltq_etop_priv *priv = netdev_priv(dev);
- int i;
-+ unsigned long flags;
-
- netif_tx_stop_all_queues(dev);
- if (priv->phydev)
-@@ -645,7 +655,9 @@
- if (!IS_RX(i) && !IS_TX(i))
- continue;
- napi_disable(&ch->napi);
-+ spin_lock_irqsave(&priv->lock, flags);
- ltq_dma_close(&ch->dma);
-+ spin_unlock_irqrestore(&priv->lock, flags);
- }
- return 0;
- }