target/linux/lantiq/patches-3.3/0020-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 diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
  14 index 63dbb83..1e89104 100644
  15 --- a/arch/mips/lantiq/irq.c
  16 +++ b/arch/mips/lantiq/irq.c
  17 @@ -10,6 +10,7 @@
  18  #include <linux/interrupt.h>
  19  #include <linux/ioport.h>
  20  #include <linux/sched.h>
  21 +#include <linux/module.h>
  22
  23  #include <asm/bootinfo.h>
  24  #include <asm/irq_cpu.h>
  25 @@ -171,6 +172,7 @@ void ltq_disable_irq(struct irq_data *d)
  26         ltq_icu_w32(ltq_icu_r32(LTQ_ICU_IM0_IER, im_nr) & ~(1 << irq_nr),
  27                 LTQ_ICU_IM0_IER, im_nr);
  28  }
  29 +EXPORT_SYMBOL(ltq_mask_and_ack_irq);
  30
  31  void ltq_mask_and_ack_irq(struct irq_data *d)
  32  {
  33 diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
  34 index ef83ef1..c156456 100644
  35 --- a/arch/mips/mm/cache.c
  36 +++ b/arch/mips/mm/cache.c
  37 @@ -58,6 +58,8 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size);
  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 diff --git a/net/atm/common.c b/net/atm/common.c
  47 index b4b44db..c30b397 100644
  48 --- a/net/atm/common.c
  49 +++ b/net/atm/common.c
  50 @@ -62,11 +62,17 @@ static void vcc_remove_socket(struct sock *sk)
  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 diff --git a/net/atm/proc.c b/net/atm/proc.c
  69 index 0d020de..9fdb539 100644
  70 --- a/net/atm/proc.c
  71 +++ b/net/atm/proc.c
  72 @@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
  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 */
  81 --
  82 1.7.9.1
  83