diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2004-09-19 08:02:23 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2004-09-19 08:02:23 +0000 |
| commit | 7ed77935ac5dbeeb9edde9b01f78d3e4c3415f8e (patch) | |
| tree | 37f78b4a1c88fd7d6aa61cede6687e485e5357ae /obsolete-buildroot | |
| parent | 5b1e2d8150ac4d19f773a3713606e4f3bda66c2e (diff) | |
alignment patch nolonger needed, ebtables patch altered
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@166 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'obsolete-buildroot')
| -rw-r--r-- | obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch | 8 | ||||
| -rw-r--r-- | obsolete-buildroot/sources/openwrt/kernel/patches/170-ip6tables-alignment.patch | 24 |
2 files changed, 0 insertions, 32 deletions
diff --git a/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch b/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch index a6d594d05f..60de305b6c 100644 --- a/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch +++ b/obsolete-buildroot/sources/openwrt/kernel/patches/140-ebtables-brnf-5.patch @@ -4742,14 +4742,6 @@ # targets obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_MIRROR) += ipt_MIRROR.o -@@ -100,6 +102,7 @@ obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt - - # generic ARP tables - obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o -+obj-$(CONFIG_IP_NF_ARP_MANGLE) += arpt_mangle.o - - # just filtering instance of ARP tables for now - obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o --- linux-2.4.21/net/ipv4/netfilter/Config.in Fri Jun 13 16:51:39 2003 +++ linux-2.4.21-ebt-brnf-3/net/ipv4/netfilter/Config.in Fri Aug 8 01:09:06 2003 @@ -43,6 +43,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; diff --git a/obsolete-buildroot/sources/openwrt/kernel/patches/170-ip6tables-alignment.patch b/obsolete-buildroot/sources/openwrt/kernel/patches/170-ip6tables-alignment.patch deleted file mode 100644 index d544f19f0e..0000000000 --- a/obsolete-buildroot/sources/openwrt/kernel/patches/170-ip6tables-alignment.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur linux/net/ipv6/netfilter/ip6_tables.c linux.fixed/net/ipv6/netfilter/ip6_tables.c ---- linux/net/ipv6/netfilter/ip6_tables.c Sat Aug 3 02:39:46 2002 -+++ linux.fixed/net/ipv6/netfilter/ip6_tables.c Thu Sep 26 17:12:07 2002 -@@ -98,10 +98,8 @@ - unsigned int hook_entry[NF_IP6_NUMHOOKS]; - unsigned int underflow[NF_IP6_NUMHOOKS]; - -- char padding[SMP_ALIGN((NF_IP6_NUMHOOKS*2+2)*sizeof(unsigned int))]; -- - /* ip6t_entry tables: one per CPU */ -- char entries[0]; -+ char entries[0] ____cacheline_aligned; - }; - - static LIST_HEAD(ip6t_target); -@@ -1425,7 +1423,7 @@ - int ret; - struct ip6t_table_info *newinfo; - static struct ip6t_table_info bootstrap -- = { 0, 0, 0, { 0 }, { 0 }, { }, { } }; -+ = { 0, 0, 0, { 0 }, { 0 }, { } }; - - MOD_INC_USE_COUNT; - newinfo = vmalloc(sizeof(struct ip6t_table_info) |