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