diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-06-21 18:32:07 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-06-21 18:32:07 +0000 |
| commit | fc6e01ad10f76d4c9273a707b8ffb6eae48236b1 (patch) | |
| tree | afc980441fbe5b23ff2dfd6d76c6210cf8f89444 | |
| parent | 0f077dfb237b608d317fa6c323afa0d462ff3e80 (diff) | |
| download | upstream-fc6e01ad10f76d4c9273a707b8ffb6eae48236b1.tar.gz upstream-fc6e01ad10f76d4c9273a707b8ffb6eae48236b1.tar.bz2 upstream-fc6e01ad10f76d4c9273a707b8ffb6eae48236b1.zip | |
refresh 2.6.25 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16537 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch index 43839bbcca..d21a021328 100644 --- a/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch @@ -774,7 +774,7 @@ +MODULE_LICENSE("GPL"); --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig -@@ -137,6 +137,17 @@ config IP_NF_FILTER +@@ -123,6 +123,17 @@ config IP_NF_FILTER To compile it as a module, choose M here. If unsure, say N. @@ -794,7 +794,7 @@ depends on IP_NF_FILTER --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile -@@ -53,6 +53,7 @@ obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_ti +@@ -52,6 +52,7 @@ obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o diff --git a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch index a7d6817d79..6d16488814 100644 --- a/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch +++ b/target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch @@ -333,7 +333,7 @@ obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig -@@ -280,6 +280,11 @@ config NF_NAT_IRC +@@ -266,6 +266,11 @@ config NF_NAT_IRC depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT default NF_NAT && NF_CONNTRACK_IRC |