diff options
author | John Crispin <john@openwrt.org> | 2010-11-03 19:02:27 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2010-11-03 19:02:27 +0000 |
commit | 251535331cb7393bc911dfd5a7c01f670b292549 (patch) | |
tree | 52d4fa9c44a169c9ed8878b7bda7c5f23789447e /target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch | |
parent | 100fc4c7cec5500314c20c5d9a2ff0aa8a07a04a (diff) | |
download | upstream-251535331cb7393bc911dfd5a7c01f670b292549.tar.gz upstream-251535331cb7393bc911dfd5a7c01f670b292549.tar.bz2 upstream-251535331cb7393bc911dfd5a7c01f670b292549.zip |
* bump kernel to 2.6.35.8 * merge arcadyn mach files * fixes ar9 * adds hack for tapi drivers
SVN-Revision: 23836
Diffstat (limited to 'target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch')
-rw-r--r-- | target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch b/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch deleted file mode 100644 index e66b7e0c16..0000000000 --- a/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s - void (*_dma_cache_inv)(unsigned long start, unsigned long size); - - EXPORT_SYMBOL(_dma_cache_wback_inv); -+EXPORT_SYMBOL(_dma_cache_wback); -+EXPORT_SYMBOL(_dma_cache_inv); - - #endif /* CONFIG_DMA_NONCOHERENT */ - ---- a/net/atm/proc.c -+++ b/net/atm/proc.c -@@ -152,7 +152,7 @@ static void *vcc_seq_next(struct seq_fil - static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) - { - static const char *const class_name[] = -- {"off","UBR","CBR","VBR","ABR"}; -+ {"off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR" }; - static const char *const aal_name[] = { - "---", "1", "2", "3/4", /* 0- 3 */ - "???", "5", "???", "???", /* 4- 7 */ ---- a/net/atm/common.c -+++ b/net/atm/common.c -@@ -56,12 +56,17 @@ static void vcc_remove_socket(struct soc - write_unlock_irq(&vcc_sklist_lock); - } - -+struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL; -+EXPORT_SYMBOL(ifx_atm_alloc_tx); - - static struct sk_buff *alloc_tx(struct atm_vcc *vcc,unsigned int size) - { - struct sk_buff *skb; - struct sock *sk = sk_atm(vcc); - -+ if (ifx_atm_alloc_tx != NULL) -+ return ifx_atm_alloc_tx(vcc, size); -+ - if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) { - pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n", - sk_wmem_alloc_get(sk), size, |