[lantiq] Add missing 3.3 patches
[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.3 / 202-owrt-atm.patch
1 --- a/arch/mips/lantiq/irq.c
2 +++ b/arch/mips/lantiq/irq.c
3 @@ -10,6 +10,7 @@
4 #include <linux/interrupt.h>
5 #include <linux/ioport.h>
6 #include <linux/sched.h>
7 +#include <linux/module.h>
8
9 #include <asm/bootinfo.h>
10 #include <asm/irq_cpu.h>
11 @@ -111,6 +112,7 @@ void ltq_mask_and_ack_irq(struct irq_dat
12 ltq_icu_w32(ltq_icu_r32(ier) & ~(1 << irq_nr), ier);
13 ltq_icu_w32((1 << irq_nr), isr);
14 }
15 +EXPORT_SYMBOL(ltq_mask_and_ack_irq);
16
17 static void ltq_ack_irq(struct irq_data *d)
18 {
19 --- a/arch/mips/mm/cache.c
20 +++ b/arch/mips/mm/cache.c
21 @@ -57,6 +57,8 @@ void (*_dma_cache_wback)(unsigned long s
22 void (*_dma_cache_inv)(unsigned long start, unsigned long size);
23
24 EXPORT_SYMBOL(_dma_cache_wback_inv);
25 +EXPORT_SYMBOL(_dma_cache_wback);
26 +EXPORT_SYMBOL(_dma_cache_inv);
27
28 #endif /* CONFIG_DMA_NONCOHERENT */
29
30 --- a/net/atm/proc.c
31 +++ b/net/atm/proc.c
32 @@ -154,7 +154,7 @@ static void *vcc_seq_next(struct seq_fil
33 static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
34 {
35 static const char *const class_name[] = {
36 - "off", "UBR", "CBR", "VBR", "ABR"};
37 + "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR"};
38 static const char *const aal_name[] = {
39 "---", "1", "2", "3/4", /* 0- 3 */
40 "???", "5", "???", "???", /* 4- 7 */
41 --- a/net/atm/common.c
42 +++ b/net/atm/common.c
43 @@ -62,11 +62,17 @@ static void vcc_remove_socket(struct soc
44 write_unlock_irq(&vcc_sklist_lock);
45 }
46
47 +struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
48 +EXPORT_SYMBOL(ifx_atm_alloc_tx);
49 +
50 static struct sk_buff *alloc_tx(struct atm_vcc *vcc, unsigned int size)
51 {
52 struct sk_buff *skb;
53 struct sock *sk = sk_atm(vcc);
54
55 + if (ifx_atm_alloc_tx != NULL)
56 + return ifx_atm_alloc_tx(vcc, size);
57 +
58 if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
59 pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
60 sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);