aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2011-11-03 15:15:52 +0000
committerJohn Crispin <blogic@openwrt.org>2011-11-03 15:15:52 +0000
commitfc4b9802d7d9bd293e71057831d02fc0169fc9d3 (patch)
treeb174b3a3d03c0c2b4a9b9c980efe38089069a2d4 /target/linux/lantiq/patches-2.6.39/220-atm_hack.patch
parente4f42228c62c1ef8f075b6765f090af0983feb89 (diff)
downloadupstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.gz
upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.bz2
upstream-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.zip
lantiq: bump to 3.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-2.6.39/220-atm_hack.patch')
-rw-r--r--target/linux/lantiq/patches-2.6.39/220-atm_hack.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch b/target/linux/lantiq/patches-2.6.39/220-atm_hack.patch
deleted file mode 100644
index 7552b1d0cf..0000000000
--- a/target/linux/lantiq/patches-2.6.39/220-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
-@@ -154,7 +154,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
-@@ -62,11 +62,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, sk->sk_sndbuf);