diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 03:09:04 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 03:09:04 +0000 |
commit | 8964c9037b9bf4619270b2f3f601ff6379649166 (patch) | |
tree | d7492f5546432cdaa4ee088b9ed326599ba4525b /target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch | |
parent | 1b3f1495ac59f24eb0bb352c615f8c4c1c758326 (diff) | |
download | master-31e0f0ae-8964c9037b9bf4619270b2f3f601ff6379649166.tar.gz master-31e0f0ae-8964c9037b9bf4619270b2f3f601ff6379649166.tar.bz2 master-31e0f0ae-8964c9037b9bf4619270b2f3f601ff6379649166.zip |
update imq patches for 2.6.26, 2.6.27, 2.6.28, 2.6.29 and 2.6.30
SVN-Revision: 15655
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch index 73ce330db5..097cbb651c 100644 --- a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch +++ b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch @@ -294,7 +294,7 @@ +#endif /* _NETFILTER_MIME_H */ --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile -@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am +@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o @@ -304,7 +304,7 @@ obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig -@@ -270,6 +270,16 @@ config NF_CONNTRACK_TFTP +@@ -270,6 +270,16 @@ To compile it as a module, choose M here. If unsure, say N. @@ -323,7 +323,7 @@ depends on NF_CONNTRACK --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co +@@ -33,6 +33,7 @@ obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o @@ -333,7 +333,7 @@ obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig -@@ -282,6 +282,11 @@ config NF_NAT_IRC +@@ -271,6 +271,11 @@ depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT default NF_NAT && NF_CONNTRACK_IRC |