target/linux/lantiq/patches-3.6/0301-owrt-atm.patch

   1 From 8d2a7d1fb561c9cb098c2b13ded34fe0f49dcca5 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Fri, 3 Aug 2012 10:27:25 +0200
   4 Subject: [PATCH 20/25] owrt atm
   5
   6 ---
   7  arch/mips/lantiq/irq.c |    2 ++
   8  arch/mips/mm/cache.c   |    2 ++
   9  net/atm/common.c       |    6 ++++++
  10  net/atm/proc.c         |    2 +-
  11  4 files changed, 11 insertions(+), 1 deletions(-)
  12
  13 Index: linux-3.6.6/arch/mips/lantiq/irq.c
  14 ===================================================================
  15 --- linux-3.6.6.orig/arch/mips/lantiq/irq.c     2012-11-08 23:08:47.000000000 +0100
  16 +++ linux-3.6.6/arch/mips/lantiq/irq.c  2012-11-08 23:10:32.023843184 +0100
  17 @@ -14,6 +14,7 @@
  18  #include <linux/of_platform.h>
  19  #include <linux/of_address.h>
  20  #include <linux/of_irq.h>
  21 +#include <linux/module.h>
  22
  23  #include <asm/bootinfo.h>
  24  #include <asm/irq_cpu.h>
  25 @@ -107,6 +108,7 @@
  26         ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier);
  27         ltq_icu_w32(im, BIT(offset), isr);
  28  }
  29 +EXPORT_SYMBOL(ltq_mask_and_ack_irq);
  30
  31  static void ltq_ack_irq(struct irq_data *d)
  32  {
  33 Index: linux-3.6.6/arch/mips/mm/cache.c
  34 ===================================================================
  35 --- linux-3.6.6.orig/arch/mips/mm/cache.c       2012-11-08 23:08:45.000000000 +0100
  36 +++ linux-3.6.6/arch/mips/mm/cache.c    2012-11-08 23:09:41.155841939 +0100
  37 @@ -58,6 +58,8 @@
  38  void (*_dma_cache_inv)(unsigned long start, unsigned long size);
  39
  40  EXPORT_SYMBOL(_dma_cache_wback_inv);
  41 +EXPORT_SYMBOL(_dma_cache_wback);
  42 +EXPORT_SYMBOL(_dma_cache_inv);
  43
  44  #endif /* CONFIG_DMA_NONCOHERENT */
  45
  46 Index: linux-3.6.6/net/atm/common.c
  47 ===================================================================
  48 --- linux-3.6.6.orig/net/atm/common.c   2012-11-05 09:57:06.000000000 +0100
  49 +++ linux-3.6.6/net/atm/common.c        2012-11-08 23:09:41.155841939 +0100
  50 @@ -62,11 +62,17 @@
  51         write_unlock_irq(&vcc_sklist_lock);
  52  }
  53
  54 +struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
  55 +EXPORT_SYMBOL(ifx_atm_alloc_tx);
  56 +
  57  static struct sk_buff *alloc_tx(struct atm_vcc *vcc, unsigned int size)
  58  {
  59         struct sk_buff *skb;
  60         struct sock *sk = sk_atm(vcc);
  61
  62 +       if (ifx_atm_alloc_tx != NULL)
  63 +               return ifx_atm_alloc_tx(vcc, size);
  64 +
  65         if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
  66                 pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
  67                          sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);
  68 Index: linux-3.6.6/net/atm/proc.c
  69 ===================================================================
  70 --- linux-3.6.6.orig/net/atm/proc.c     2012-11-05 09:57:06.000000000 +0100
  71 +++ linux-3.6.6/net/atm/proc.c  2012-11-08 23:09:41.159841940 +0100
  72 @@ -154,7 +154,7 @@
  73  static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
  74  {
  75         static const char *const class_name[] = {
  76 -               "off", "UBR", "CBR", "VBR", "ABR"};
  77 +               "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR"};
  78         static const char *const aal_name[] = {
  79                 "---",  "1",    "2",    "3/4",  /*  0- 3 */
  80                 "???",  "5",    "???",  "???",  /*  4- 7 */