KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update netfilter patches, fix atheros

Browse source 
SVN-Revision: 7320
This commit is contained in:
Imre Kaloz 2007-05-23 23:10:09 +00:00
parent 227d9b1b0a
commit aa8d377d7e
11 changed files with 1545 additions and 2824 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/atheros-2.6/config/default
View file

@ -159,7 +159,7 @@ CONFIG_PAGE_SIZE_4KB=y
# CONFIG_PCCARD is not set # CONFIG_PCCARD is not set
# CONFIG_PMC_YOSEMITE is not set # CONFIG_PMC_YOSEMITE is not set
# CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_JBS is not set
# CONFIG_PNX8550_V2PCI is not set # CONFIG_PNX8550_STB810 is not set
# CONFIG_RTC is not set # CONFIG_RTC is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

3
target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h
View file

@ -27,9 +27,8 @@
#define DO_AR5315(...) #define DO_AR5315(...)
#endif #endif
#include <irq.h>
#define MIPS_CPU_IRQ_BASE 0x00
#define AR531X_HIGH_PRIO 0x10 #define AR531X_HIGH_PRIO 0x10
#define AR531X_MISC_IRQ_BASE 0x20 #define AR531X_MISC_IRQ_BASE 0x20
#define AR531X_GPIO_IRQ_BASE 0x30 #define AR531X_GPIO_IRQ_BASE 0x30

2
target/linux/atheros-2.6/files/arch/mips/atheros/irq.c
View file

@ -74,7 +74,7 @@ asmlinkage void plat_irq_dispatch(void)
void __init arch_init_irq(void) void __init arch_init_irq(void)
{ {
clear_c0_status(ST0_IM); clear_c0_status(ST0_IM);
mips_cpu_irq_init(0); mips_cpu_irq_init();
/* Initialize interrupt controllers */ /* Initialize interrupt controllers */
DO_AR5312(ar5312_misc_intr_init(AR531X_MISC_IRQ_BASE);) DO_AR5312(ar5312_misc_intr_init(AR531X_MISC_IRQ_BASE);)

1
target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
View file

@ -38,6 +38,7 @@
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/sched.h>
#include <linux/squashfs_fs.h> #include <linux/squashfs_fs.h>
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <linux/delay.h> #include <linux/delay.h>

2028
target/linux/atheros-2.6/patches/150-mips_cache_cleanup.patch
View file

File diff suppressed because it is too large Load diff

8
target/linux/generic-2.6/config-template
View file

@ -415,6 +415,8 @@ CONFIG_IP_DCCP_ACKVEC=y
CONFIG_IP_DCCP_CCID2=m CONFIG_IP_DCCP_CCID2=m
# CONFIG_IP_DCCP_CCID2_DEBUG is not set # CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_IP_DCCP_CCID3=m CONFIG_IP_DCCP_CCID3=m
# CONFIG_IP_DCCP_CCID3_DEBUG is not set
CONFIG_IP_DCCP_CCID3_RTO=100
CONFIG_IP_DCCP_TFRC_LIB=m CONFIG_IP_DCCP_TFRC_LIB=m
CONFIG_IP_FIB_HASH=y CONFIG_IP_FIB_HASH=y
# CONFIG_IP_FIB_TRIE is not set # CONFIG_IP_FIB_TRIE is not set
@ -469,6 +471,7 @@ CONFIG_IP_NF_SET=m
CONFIG_IP_NF_SET_HASHSIZE=1024 CONFIG_IP_NF_SET_HASHSIZE=1024
CONFIG_IP_NF_SET_IPHASH=m CONFIG_IP_NF_SET_IPHASH=m
CONFIG_IP_NF_SET_IPMAP=m CONFIG_IP_NF_SET_IPMAP=m
CONFIG_IP_NF_SET_IPPORTHASH=m
CONFIG_IP_NF_SET_IPTREE=m CONFIG_IP_NF_SET_IPTREE=m
CONFIG_IP_NF_SET_MACIPMAP=m CONFIG_IP_NF_SET_MACIPMAP=m
CONFIG_IP_NF_SET_MAX=256 CONFIG_IP_NF_SET_MAX=256
@ -537,6 +540,7 @@ CONFIG_JFS_FS=m
CONFIG_JOLIET=y CONFIG_JOLIET=y
# CONFIG_KALLSYMS is not set # CONFIG_KALLSYMS is not set
# CONFIG_KARMA_PARTITION is not set # CONFIG_KARMA_PARTITION is not set
# CONFIG_KEXEC is not set
# CONFIG_KEYS is not set # CONFIG_KEYS is not set
# CONFIG_KMOD is not set # CONFIG_KMOD is not set
# CONFIG_LAPB is not set # CONFIG_LAPB is not set
@ -806,6 +810,7 @@ CONFIG_PCI_HERMES=m
# CONFIG_PHYLIB is not set # CONFIG_PHYLIB is not set
CONFIG_PLIST=y CONFIG_PLIST=y
CONFIG_PLX_HERMES=m CONFIG_PLX_HERMES=m
# CONFIG_PM is not set
# CONFIG_POSIX_MQUEUE is not set # CONFIG_POSIX_MQUEUE is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPPOATM=m CONFIG_PPPOATM=m
@ -989,6 +994,7 @@ CONFIG_SND_RAWMIDI=m
# CONFIG_SND_RME9652 is not set # CONFIG_SND_RME9652 is not set
# CONFIG_SND_SEQUENCER is not set # CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SONICVIBES is not set # CONFIG_SND_SONICVIBES is not set
# CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TIMER=m CONFIG_SND_TIMER=m
@ -1001,7 +1007,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VX222 is not set # CONFIG_SND_VX222 is not set
# CONFIG_SND_VXPOCKET is not set # CONFIG_SND_VXPOCKET is not set
# CONFIG_SND_YMFPCI is not set # CONFIG_SND_YMFPCI is not set
# CONFIG_SNI_RM200_PCI is not set # CONFIG_SNI_RM is not set
# CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set
CONFIG_SOUND=m CONFIG_SOUND=m
# CONFIG_SOUND_PRIME is not set # CONFIG_SOUND_PRIME is not set

10
target/linux/generic-2.6/patches/013-ipset_compile_fix.patch
View file

@ -1,10 +0,0 @@
--- linux.old/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-05-23 23:34:49.100660208 +0200
+++ linux.dev/include/linux/netfilter_ipv4/ip_set_malloc.h 2007-05-23 23:36:36.528328720 +0200
@@ -2,6 +2,7 @@
#define _IP_SET_MALLOC_H
#ifdef __KERNEL__
+#include <asm/pgtable.h>
/* Memory allocation and deallocation */
static size_t max_malloc_size = 0;

2303
target/linux/generic-2.6/patches/130-netfilter-ipset.patch
View file

File diff suppressed because it is too large Load diff

4
target/linux/generic-2.6/patches/140-netfilter_time.patch
View file

@ -146,12 +146,12 @@ diff -urN linux-2.6.19.old/net/ipv4/netfilter/ipt_time.c linux-2.6.19.dev/net/ip
+static int __init init(void) +static int __init init(void)
+{ +{
+ printk("ipt_time loading\n"); + printk("ipt_time loading\n");
+ return ipt_register_match(&time_match); + return xt_register_match(&time_match);
+} +}
+ +
+static void __exit fini(void) +static void __exit fini(void)
+{ +{
+ ipt_unregister_match(&time_match); + xt_unregister_match(&time_match);
+ printk("ipt_time unloaded\n"); + printk("ipt_time unloaded\n");
+} +}
+ +

4
target/linux/generic-2.6/patches/150-netfilter_imq.patch
View file

@ -802,7 +802,7 @@
+ +
+static int __init init(void) +static int __init init(void)
+{ +{
+ if (ip6t_register_target(&ip6t_imq_reg)) + if (xt_register_target(&ip6t_imq_reg))
+ return -EINVAL; + return -EINVAL;
+ +
+ return 0; + return 0;
@ -810,7 +810,7 @@
+ +
+static void __exit fini(void) +static void __exit fini(void)
+{ +{
+ ip6t_unregister_target(&ip6t_imq_reg); + xt_unregister_target(&ip6t_imq_reg);
+} +}
+ +
+module_init(init); +module_init(init);

4
target/linux/generic-2.6/patches/160-netfilter_route.patch
View file

@ -906,7 +906,7 @@ diff -Nur linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1-owrt/net
+static int __init init(void) +static int __init init(void)
+{ +{
+ printk(KERN_DEBUG "registering ipv6 ROUTE target\n"); + printk(KERN_DEBUG "registering ipv6 ROUTE target\n");
+ if (ip6t_register_target(&ip6t_route_reg)) + if (xt_register_target(&ip6t_route_reg))
+ return -EINVAL; + return -EINVAL;
+ +
+ return 0; + return 0;
@ -915,7 +915,7 @@ diff -Nur linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1-owrt/net
+ +
+static void __exit fini(void) +static void __exit fini(void)
+{ +{
+ ip6t_unregister_target(&ip6t_route_reg); + xt_unregister_target(&ip6t_route_reg);
+} +}
+ +
+module_init(init); +module_init(init);