diff options
| author | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:09:45 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2015-02-08 15:09:45 +0000 |
| commit | 683da1384bc567d1a29544ca98f56dea4542cb3c (patch) | |
| tree | 206e0e80e66a93e8eee961cde4eaf207a413a060 /target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch | |
| parent | 7294b892dcc5e28a5180d6e9bb3fa9bb08e29493 (diff) | |
| download | upstream-683da1384bc567d1a29544ca98f56dea4542cb3c.tar.gz upstream-683da1384bc567d1a29544ca98f56dea4542cb3c.tar.bz2 upstream-683da1384bc567d1a29544ca98f56dea4542cb3c.zip | |
lantiq: fix patches after 3.14.32 bump
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 44320
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch index 7f737fab1a..6e3a03a498 100644 --- a/target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch +++ b/target/linux/lantiq/patches-3.14/0028-NET-lantiq-various-etop-fixes.patch @@ -265,7 +265,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return IRQ_HANDLED; } -@@ -224,7 +301,7 @@ ltq_etop_free_channel(struct net_device +@@ -224,7 +301,7 @@ ltq_etop_free_channel(struct net_device ltq_dma_free(&ch->dma); if (ch->dma.irq) free_irq(ch->dma.irq, priv); @@ -442,7 +442,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> } static void -@@ -309,7 +454,10 @@ ltq_etop_get_settings(struct net_device +@@ -309,7 +454,10 @@ ltq_etop_get_settings(struct net_device { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -454,7 +454,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> } static int -@@ -317,7 +465,10 @@ ltq_etop_set_settings(struct net_device +@@ -317,7 +465,10 @@ ltq_etop_set_settings(struct net_device { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -675,7 +675,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> return 0; } -@@ -520,16 +716,16 @@ ltq_etop_tx(struct sk_buff *skb, struct +@@ -520,16 +716,16 @@ ltq_etop_tx(struct sk_buff *skb, struct int queue = skb_get_queue_mapping(skb); struct netdev_queue *txq = netdev_get_tx_queue(dev, queue); struct ltq_etop_priv *priv = netdev_priv(dev); @@ -697,7 +697,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> netdev_err(dev, "tx ring full\n"); netif_tx_stop_queue(txq); return NETDEV_TX_BUSY; -@@ -537,7 +733,7 @@ ltq_etop_tx(struct sk_buff *skb, struct +@@ -537,7 +733,7 @@ ltq_etop_tx(struct sk_buff *skb, struct /* dma needs to start on a 16 byte aligned address */ byte_offset = CPHYSADDR(skb->data) % 16; @@ -706,7 +706,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> dev->trans_start = jiffies; -@@ -547,11 +743,11 @@ ltq_etop_tx(struct sk_buff *skb, struct +@@ -547,11 +743,11 @@ ltq_etop_tx(struct sk_buff *skb, struct wmb(); desc->ctl = LTQ_DMA_OWN | LTQ_DMA_SOP | LTQ_DMA_EOP | LTQ_DMA_TX_OFFSET(byte_offset) | (len & LTQ_DMA_SIZE_MASK); |