| 1 | Index: linux-2.6.30.9/arch/mips/mm/cache.c |
| 2 | =================================================================== |
| 3 | --- linux-2.6.30.9.orig/arch/mips/mm/cache.c 2009-11-01 16:10:29.000000000 +0100 |
| 4 | +++ linux-2.6.30.9/arch/mips/mm/cache.c 2009-11-01 16:11:56.000000000 +0100 |
| 5 | @@ -52,6 +52,8 @@ |
| 6 | void (*_dma_cache_inv)(unsigned long start, unsigned long size); |
| 7 | |
| 8 | EXPORT_SYMBOL(_dma_cache_wback_inv); |
| 9 | +EXPORT_SYMBOL(_dma_cache_wback); |
| 10 | +EXPORT_SYMBOL(_dma_cache_inv); |
| 11 | |
| 12 | #endif /* CONFIG_DMA_NONCOHERENT */ |
| 13 | |
| 14 | Index: linux-2.6.30.9/net/atm/proc.c |
| 15 | =================================================================== |
| 16 | --- linux-2.6.30.9.orig/net/atm/proc.c 2009-11-01 16:34:42.000000000 +0100 |
| 17 | +++ linux-2.6.30.9/net/atm/proc.c 2009-11-01 16:35:59.000000000 +0100 |
| 18 | @@ -151,7 +151,7 @@ |
| 19 | |
| 20 | static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) |
| 21 | { |
| 22 | - static const char *class_name[] = { "off","UBR","CBR","VBR","ABR" }; |
| 23 | + static const char *class_name[] = { "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR" }; |
| 24 | static const char *aal_name[] = { |
| 25 | "---", "1", "2", "3/4", /* 0- 3 */ |
| 26 | "???", "5", "???", "???", /* 4- 7 */ |
| 27 | Index: linux-2.6.30.9/net/atm/common.c |
| 28 | =================================================================== |
| 29 | --- linux-2.6.30.9.orig/net/atm/common.c 2009-11-01 16:38:12.000000000 +0100 |
| 30 | +++ linux-2.6.30.9/net/atm/common.c 2009-11-01 16:47:06.000000000 +0100 |
| 31 | @@ -56,12 +56,17 @@ |
| 32 | write_unlock_irq(&vcc_sklist_lock); |
| 33 | } |
| 34 | |
| 35 | +struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL; |
| 36 | +EXPORT_SYMBOL(ifx_atm_alloc_tx); |
| 37 | |
| 38 | static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size) |
| 39 | { |
| 40 | struct sk_buff *skb; |
| 41 | struct sock *sk = sk_atm(vcc); |
| 42 | |
| 43 | + if (ifx_atm_alloc_tx != NULL) |
| 44 | + return ifx_atm_alloc_tx(vcc, size); |
| 45 | + |
| 46 | if (atomic_read(&sk->sk_wmem_alloc) && !atm_may_send(vcc, size)) { |
| 47 | pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n", |
| 48 | atomic_read(&sk->sk_wmem_alloc), size, |
| 49 | |
