atheros: USB support
[openwrt-10.03/.git] / target / linux / generic-2.6 / patches / 160-netfilter_route.patch
index a7386038cb92c70bd8d2ff454512ceabe0573e88..ca342af66803f374c88f61244340b1bbd6738620 100644 (file)
@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ipt_ROUTE.h
---- linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_ROUTE.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv4/ipt_ROUTE.h       2007-05-23 20:32:22.000000000 +0200
+diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h
+--- linux-2.6.21.1.old/include/linux/netfilter_ipv4/ipt_ROUTE.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/include/linux/netfilter_ipv4/ipt_ROUTE.h        2007-05-26 20:37:08.971856648 +0200
 @@ -0,0 +1,23 @@
 +/* Header file for iptables ipt_ROUTE target
 + *
@@ -25,9 +25,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.21.1
 +#define IPT_ROUTE_TEE             0x02
 +
 +#endif /*_IPT_ROUTE_H_target*/
-diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.1-owrt/include/linux/netfilter_ipv6/ip6t_ROUTE.h
---- linux-2.6.21.1/include/linux/netfilter_ipv6/ip6t_ROUTE.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1-owrt/include/linux/netfilter_ipv6/ip6t_ROUTE.h      2007-05-23 20:32:22.000000000 +0200
+diff -urN linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h
+--- linux-2.6.21.1.old/include/linux/netfilter_ipv6/ip6t_ROUTE.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/include/linux/netfilter_ipv6/ip6t_ROUTE.h       2007-05-26 20:37:09.001852088 +0200
 @@ -0,0 +1,23 @@
 +/* Header file for iptables ip6t_ROUTE target
 + *
@@ -52,9 +52,9 @@ diff -Nur linux-2.6.21.1/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.21.
 +#define IP6T_ROUTE_TEE             0x02
 +
 +#endif /*_IP6T_ROUTE_H_target*/
-diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_ROUTE.c
---- linux-2.6.21.1/net/ipv4/netfilter/ipt_ROUTE.c      1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/ipt_ROUTE.c 2007-05-23 20:32:22.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c
+--- linux-2.6.21.1.old/net/ipv4/netfilter/ipt_ROUTE.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/net/ipv4/netfilter/ipt_ROUTE.c  2007-05-26 20:37:09.001852088 +0200
 @@ -0,0 +1,483 @@
 +/*
 + * This implements the ROUTE target, which enables you to setup unusual
@@ -539,12 +539,12 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/ipt_ROUTE.c linux-2.6.21.1-owrt/net/
 +
 +module_init(init);
 +module_exit(fini);
-diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv4/netfilter/Kconfig
---- linux-2.6.21.1/net/ipv4/netfilter/Kconfig  2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/Kconfig     2007-05-23 20:32:22.000000000 +0200
-@@ -657,5 +657,22 @@
-         Allows altering the ARP packet payload: source and destination
-         hardware and network addresses.
+diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig
+--- linux-2.6.21.1.old/net/ipv4/netfilter/Kconfig      2007-05-26 20:37:08.734892672 +0200
++++ linux-2.6.21.1.dev/net/ipv4/netfilter/Kconfig      2007-05-26 20:37:09.002851936 +0200
+@@ -817,5 +817,22 @@
+         To compile it as a module, choose M here.  If unsure, say N.
  
 +config IP_NF_TARGET_ROUTE
 +      tristate  'ROUTE target support'
@@ -565,20 +565,20 @@ diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv4
 +
  endmenu
  
-diff -Nur linux-2.6.21.1/net/ipv4/netfilter/Makefile linux-2.6.21.1-owrt/net/ipv4/netfilter/Makefile
---- linux-2.6.21.1/net/ipv4/netfilter/Makefile 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1-owrt/net/ipv4/netfilter/Makefile    2007-05-23 20:32:22.000000000 +0200
-@@ -98,6 +98,7 @@
- obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
+diff -urN linux-2.6.21.1.old/net/ipv4/netfilter/Makefile linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile
+--- linux-2.6.21.1.old/net/ipv4/netfilter/Makefile     2007-05-26 20:37:08.735892520 +0200
++++ linux-2.6.21.1.dev/net/ipv4/netfilter/Makefile     2007-05-26 20:37:09.002851936 +0200
+@@ -103,6 +103,7 @@
+ obj-$(CONFIG_IP_NF_TARGET_IMQ) += ipt_IMQ.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
  obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
 +obj-$(CONFIG_IP_NF_TARGET_ROUTE) += ipt_ROUTE.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
  obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o
  obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
-diff -Nur linux-2.6.21.1/net/ipv6/ipv6_syms.c linux-2.6.21.1-owrt/net/ipv6/ipv6_syms.c
---- linux-2.6.21.1/net/ipv6/ipv6_syms.c        2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1-owrt/net/ipv6/ipv6_syms.c   2007-05-23 20:32:22.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/ipv6/ipv6_syms.c linux-2.6.21.1.dev/net/ipv6/ipv6_syms.c
+--- linux-2.6.21.1.old/net/ipv6/ipv6_syms.c    2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/net/ipv6/ipv6_syms.c    2007-05-26 20:37:09.002851936 +0200
 @@ -10,6 +10,7 @@
  EXPORT_SYMBOL(icmpv6_statistics);
  EXPORT_SYMBOL(icmpv6_err_convert);
@@ -587,9 +587,9 @@ diff -Nur linux-2.6.21.1/net/ipv6/ipv6_syms.c linux-2.6.21.1-owrt/net/ipv6/ipv6_
  EXPORT_SYMBOL(register_inet6addr_notifier);
  EXPORT_SYMBOL(unregister_inet6addr_notifier);
  EXPORT_SYMBOL(ip6_route_output);
-diff -Nur linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1-owrt/net/ipv6/netfilter/ip6t_ROUTE.c
---- linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c     1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.21.1-owrt/net/ipv6/netfilter/ip6t_ROUTE.c        2007-05-23 20:32:22.000000000 +0200
+diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c
+--- linux-2.6.21.1.old/net/ipv6/netfilter/ip6t_ROUTE.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.21.1.dev/net/ipv6/netfilter/ip6t_ROUTE.c 2007-05-26 20:37:09.003851784 +0200
 @@ -0,0 +1,330 @@
 +/*
 + * This implements the ROUTE v6 target, which enables you to setup unusual
@@ -921,10 +921,10 @@ diff -Nur linux-2.6.21.1/net/ipv6/netfilter/ip6t_ROUTE.c linux-2.6.21.1-owrt/net
 +module_init(init);
 +module_exit(fini);
 +MODULE_LICENSE("GPL");
-diff -Nur linux-2.6.21.1/net/ipv6/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv6/netfilter/Kconfig
---- linux-2.6.21.1/net/ipv6/netfilter/Kconfig  2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1-owrt/net/ipv6/netfilter/Kconfig     2007-05-23 20:32:22.000000000 +0200
-@@ -200,5 +200,18 @@
+diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig
+--- linux-2.6.21.1.old/net/ipv6/netfilter/Kconfig      2007-05-26 20:37:08.809881272 +0200
++++ linux-2.6.21.1.dev/net/ipv6/netfilter/Kconfig      2007-05-26 20:37:09.003851784 +0200
+@@ -209,5 +209,18 @@
          If you want to compile it as a module, say M here and read
          <file:Documentation/modules.txt>.  If unsure, say `N'.
  
@@ -943,10 +943,10 @@ diff -Nur linux-2.6.21.1/net/ipv6/netfilter/Kconfig linux-2.6.21.1-owrt/net/ipv6
 +
  endmenu
  
-diff -Nur linux-2.6.21.1/net/ipv6/netfilter/Makefile linux-2.6.21.1-owrt/net/ipv6/netfilter/Makefile
---- linux-2.6.21.1/net/ipv6/netfilter/Makefile 2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1-owrt/net/ipv6/netfilter/Makefile    2007-05-23 20:32:22.000000000 +0200
-@@ -19,6 +19,7 @@
+diff -urN linux-2.6.21.1.old/net/ipv6/netfilter/Makefile linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile
+--- linux-2.6.21.1.old/net/ipv6/netfilter/Makefile     2007-05-26 20:37:08.809881272 +0200
++++ linux-2.6.21.1.dev/net/ipv6/netfilter/Makefile     2007-05-26 20:37:09.003851784 +0200
+@@ -20,6 +20,7 @@
  obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
  obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
  obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o