[netfilter-cvslog] r4052 - in trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11: include/linux/netfilter_ipv4 net/ipv4/netfilter

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-06-27 17:18:57 +0200 (Mon, 27 Jun 2005)
New Revision: 4052

Removed:
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2
Modified:
   trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/Makefile.ladd
Log:
fix some post-2.6.11 issues


Deleted: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd	2005-06-27 15:13:27 UTC (rev 4051)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd	2005-06-27 15:18:57 UTC (rev 4052)
@@ -1,2 +0,0 @@
-	/* insert conntrack helper private data (master) here */
-	struct ip_ct_rtsp_master ct_rtsp_info;

Deleted: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2	2005-06-27 15:13:27 UTC (rev 4051)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/include/linux/netfilter_ipv4/ip_conntrack.h.ladd_2	2005-06-27 15:18:57 UTC (rev 4052)
@@ -1,2 +0,0 @@
-/* Add protocol helper include file here */
-#include <linux/netfilter_ipv4/ip_conntrack_rtsp.h>

Modified: trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/Makefile.ladd
===================================================================
--- trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/Makefile.ladd	2005-06-27 15:13:27 UTC (rev 4051)
+++ trunk/patch-o-matic-ng/patchlets/rtsp-conntrack/linux-2.6.11/net/ipv4/netfilter/Makefile.ladd	2005-06-27 15:18:57 UTC (rev 4052)
@@ -2,8 +2,5 @@
 
 # rtsp protocol support
 obj-$(CONFIG_IP_NF_RTSP) += ip_conntrack_rtsp.o
-ifdef CONFIG_IP_NF_NAT_RTSP
-       export-objs += ip_conntrack_rtsp.o
-endif
 obj-$(CONFIG_IP_NF_NAT_RTSP) += ip_nat_rtsp.o