--- zzzz-none-000/linux-2.6.28.10/net/netfilter/Kconfig	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/net/netfilter/Kconfig	2010-03-09 15:05:48.000000000 +0000
@@ -158,6 +158,49 @@
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+config IFX_NF_FIXES
+      tristate "IFX Fixes in FTP ALG"
+	  depends on NF_CONNTRACK_FTP && IFX_ADDON && IFX 
+	  default y
+	  help
+	    This is a fix to assign the mask for the port in the expectation structure .
+
+
+config NF_CONNTRACK_RTSP
+        tristate "RTSP protocol support"
+        depends on NF_CONNTRACK && IFX_ADDON && IFX 
+		help
+		  This option supports RTSP connection tracking and NAT .
+		  RTSP , Real time streaming protocol , is a protocol
+		  for use in streaming media systems which allows a client to
+		  remotely control a streaming media server .The default
+		  port for rtsp protocol is 554 on both UDP and TCP.
+		  
+		  To compile it as a module, choose M here.  If unsure, say N.
+
+config NF_CONNTRACK_TALK
+        tristate "TALK protocol support (EXPERIMENTAL) "
+        depends on NF_CONNTRACK && IFX_ADDON && IFX
+		help
+		  This option supports TALK protocol connection tracking and NAT .
+		  Talk was a program originally used for live text communication
+		  between different users of a single multi-user computer .
+		  
+		  To compile it as a module, choose M here.  If unsure, say N.
+		  
+config NF_CONNTRACK_MMS
+        tristate "MMS protocol support (EXPERIMENTAL) "
+        depends on NF_CONNTRACK && IFX_ADDON && IFX
+		help
+		  This option supports MMS protocol connection tracking and NAT .	
+		  Microsoft Media Server (MMS) protocol is used to transfer unicast
+		  data. MMS can be transported via UDP or TCP. If the Windows Media Player
+		  client cannot negotiate a reliable connection with MMS over UDP, 
+		  it will attempt connection over TCP. The MMS default port is UDP/TCP 1755.
+
+		  
+		  To compile it as a module, choose M here.  If unsure, say N.
+
 config NF_CONNTRACK_H323
 	tristate "H.323 protocol support"
 	depends on (IPV6 || IPV6=n)
@@ -596,6 +639,8 @@
 	  destination address' or `500pps from any given source address'
 	  with a single rule.
 
+
+
 config NETFILTER_XT_MATCH_HELPER
 	tristate '"helper" match support'
 	depends on NF_CONNTRACK
@@ -856,6 +901,11 @@
 
 endif # NETFILTER_XTABLES
 
+if LANTIQ
+#IFX plaform specific
+source "net/netfilter/Kconfig.ifx"
+endif
+
 endmenu
 
 source "net/netfilter/ipvs/Kconfig"