mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 22:49:43 +02:00
d30299b51e
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18259 3c298f89-4303-0410-b956-a3cf2f4a3e73
49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
Index: linux-2.6.30.9/arch/mips/mm/cache.c
|
|
===================================================================
|
|
--- linux-2.6.30.9.orig/arch/mips/mm/cache.c 2009-11-01 16:10:29.000000000 +0100
|
|
+++ linux-2.6.30.9/arch/mips/mm/cache.c 2009-11-01 16:11:56.000000000 +0100
|
|
@@ -52,6 +52,8 @@
|
|
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 */
|
|
|
|
Index: linux-2.6.30.9/net/atm/proc.c
|
|
===================================================================
|
|
--- linux-2.6.30.9.orig/net/atm/proc.c 2009-11-01 16:34:42.000000000 +0100
|
|
+++ linux-2.6.30.9/net/atm/proc.c 2009-11-01 16:35:59.000000000 +0100
|
|
@@ -151,7 +151,7 @@
|
|
|
|
static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
|
|
{
|
|
- static const char *class_name[] = { "off","UBR","CBR","VBR","ABR" };
|
|
+ static const char *class_name[] = { "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR" };
|
|
static const char *aal_name[] = {
|
|
"---", "1", "2", "3/4", /* 0- 3 */
|
|
"???", "5", "???", "???", /* 4- 7 */
|
|
Index: linux-2.6.30.9/net/atm/common.c
|
|
===================================================================
|
|
--- linux-2.6.30.9.orig/net/atm/common.c 2009-11-01 16:38:12.000000000 +0100
|
|
+++ linux-2.6.30.9/net/atm/common.c 2009-11-01 16:47:06.000000000 +0100
|
|
@@ -56,12 +56,17 @@
|
|
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 (atomic_read(&sk->sk_wmem_alloc) && !atm_may_send(vcc, size)) {
|
|
pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
|
|
atomic_read(&sk->sk_wmem_alloc), size,
|