deptest: Do not clobber the base build and staging dirs
[openwrt/svn-archive/archive.git] / target / linux / ifxmips / patches-2.6.33 / 210-atm_hack.patch
1 --- a/arch/mips/mm/cache.c
2 +++ b/arch/mips/mm/cache.c
3 @@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s
4 void (*_dma_cache_inv)(unsigned long start, unsigned long size);
5
6 EXPORT_SYMBOL(_dma_cache_wback_inv);
7 +EXPORT_SYMBOL(_dma_cache_wback);
8 +EXPORT_SYMBOL(_dma_cache_inv);
9
10 #endif /* CONFIG_DMA_NONCOHERENT */
11
12 --- a/net/atm/proc.c
13 +++ b/net/atm/proc.c
14 @@ -152,7 +152,7 @@ static void *vcc_seq_next(struct seq_fil
15 static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
16 {
17 static const char *const class_name[] =
18 - {"off","UBR","CBR","VBR","ABR"};
19 + {"off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR" };
20 static const char *const aal_name[] = {
21 "---", "1", "2", "3/4", /* 0- 3 */
22 "???", "5", "???", "???", /* 4- 7 */
23 --- a/net/atm/common.c
24 +++ b/net/atm/common.c
25 @@ -56,12 +56,17 @@ static void vcc_remove_socket(struct soc
26 write_unlock_irq(&vcc_sklist_lock);
27 }
28
29 +struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
30 +EXPORT_SYMBOL(ifx_atm_alloc_tx);
31
32 static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size)
33 {
34 struct sk_buff *skb;
35 struct sock *sk = sk_atm(vcc);
36
37 + if (ifx_atm_alloc_tx != NULL)
38 + return ifx_atm_alloc_tx(vcc, size);
39 +
40 if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
41 pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
42 sk_wmem_alloc_get(sk), size,