- updates for 2.6.37

[packages/kernel.git] / kernel-nf_rtsp.patch

diff --git a/kernel-nf_rtsp.patch b/kernel-nf_rtsp.patch
index 4655c9bac9452dd93f7cedcebaabb5efba52a5db..12b13bdbaaf94e1b2d6966aef4a857039abb4492 100644 (file)
--- a/kernel-nf_rtsp.patch
+++ b/kernel-nf_rtsp.patch
@@ -1,7 +1,7 @@
 diff -purN linux-2.6.23-rc2.orig/include/linux/netfilter_helpers.h linux-2.6.23-rc2/include/linux/netfilter_helpers.h
 --- linux-2.6.23-rc2.orig/include/linux/netfilter_helpers.h    1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.23-rc2/include/linux/netfilter_helpers.h 2007-08-05 10:53:55.000000000 +0200
-@@ -0,0 +1,133 @@
+@@ -0,0 +1,139 @@
 +/*
 + * Helpers for netfiler modules.  This file provides implementations for basic
 + * functions such as strncasecmp(), etc.
@@ -132,6 +132,12 @@ diff -purN linux-2.6.23-rc2.orig/include/linux/netfilter_helpers.h linux-2.6.23-
 +}
 +#endif /* NF_NEED_NEXTLINE */
 +
++#define NIPQUAD(addr) \
++       ((unsigned char *)&addr)[0], \
++       ((unsigned char *)&addr)[1], \
++       ((unsigned char *)&addr)[2], \
++       ((unsigned char *)&addr)[3]
++
 +#endif /* __KERNEL__ */
 +
 +#endif /* _NETFILTER_HELPERS_H */
@@ -246,7 +252,7 @@ diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Kconfig linux-2.6.23-rc2/net
 diff -purN linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile linux-2.6.23-rc2/net/ipv4/netfilter/Makefile
 --- linux-2.6.23-rc2.orig/net/ipv4/netfilter/Makefile  2007-08-05 21:14:19.000000000 +0200
 +++ linux-2.6.23-rc2/net/ipv4/netfilter/Makefile       2007-08-05 10:53:55.000000000 +0200
-@@ -0,0 +0,1 @@
+@@ -0,0 +1 @@
 +obj-$(CONFIG_NF_NAT_RTSP) += nf_nat_rtsp.o
 diff -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netfilter/Kconfig
 --- linux-2.6.23-rc2.orig/net/netfilter/Kconfig        2007-08-05 21:17:02.000000000 +0200
@@ -271,7 +277,7 @@ diff -purN linux-2.6.23-rc2.orig/net/netfilter/Kconfig linux-2.6.23-rc2/net/netf
 diff -purN linux-2.6.23-rc2.orig/net/netfilter/Makefile linux-2.6.23-rc2/net/netfilter/Makefile
 --- linux-2.6.23-rc2.orig/net/netfilter/Makefile       2007-08-05 21:17:02.000000000 +0200
 +++ linux-2.6.23-rc2/net/netfilter/Makefile    2007-08-05 11:04:59.000000000 +0200
-@@ -0,0 +0,1 @@
+@@ -0,0 +1 @@
 +obj-$(CONFIG_NF_CONNTRACK_RTSP) += nf_conntrack_rtsp.o
 diff -purN linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h linux-2.6.24-rc1/include/linux/netfilter/nf_conntrack_rtsp.h
 --- linux-2.6.24-rc1.orig/include/linux/netfilter/nf_conntrack_rtsp.h  1970-01-01 01:00:00.000000000 +0100