linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / netfilter_ipv4 / ip_conntrack.h

diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index 5a66962..74da4eb 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -29,7 +29,6 @@ union ip_conntrack_expect_proto {
 };
 
 /* Add protocol helper include file here */
-#include <linux/netfilter_ipv4/ip_conntrack_h323.h>
 #include <linux/netfilter_ipv4/ip_conntrack_pptp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_amanda.h>
 #include <linux/netfilter_ipv4/ip_conntrack_ftp.h>
@@ -38,7 +37,6 @@ union ip_conntrack_expect_proto {
 /* per conntrack: application helper private data */
 union ip_conntrack_help {
        /* insert conntrack helper private data (master) here */
-       struct ip_ct_h323_master ct_h323_info;
        struct ip_ct_pptp_master ct_pptp_info;
        struct ip_ct_ftp_master ct_ftp_info;
        struct ip_ct_irc_master ct_irc_info;
@@ -318,30 +316,29 @@ DECLARE_PER_CPU(struct ip_conntrack_ecache, ip_conntrack_ecache);
 
 #define CONNTRACK_ECACHE(x)    (__get_cpu_var(ip_conntrack_ecache).x)
  
-extern struct atomic_notifier_head ip_conntrack_chain;
-extern struct atomic_notifier_head ip_conntrack_expect_chain;
+extern struct notifier_block *ip_conntrack_chain;
+extern struct notifier_block *ip_conntrack_expect_chain;
 
 static inline int ip_conntrack_register_notifier(struct notifier_block *nb)
 {
-       return atomic_notifier_chain_register(&ip_conntrack_chain, nb);
+       return notifier_chain_register(&ip_conntrack_chain, nb);
 }
 
 static inline int ip_conntrack_unregister_notifier(struct notifier_block *nb)
 {
-       return atomic_notifier_chain_unregister(&ip_conntrack_chain, nb);
+       return notifier_chain_unregister(&ip_conntrack_chain, nb);
 }
 
 static inline int 
 ip_conntrack_expect_register_notifier(struct notifier_block *nb)
 {
-       return atomic_notifier_chain_register(&ip_conntrack_expect_chain, nb);
+       return notifier_chain_register(&ip_conntrack_expect_chain, nb);
 }
 
 static inline int
 ip_conntrack_expect_unregister_notifier(struct notifier_block *nb)
 {
-       return atomic_notifier_chain_unregister(&ip_conntrack_expect_chain,
-                       nb);
+       return notifier_chain_unregister(&ip_conntrack_expect_chain, nb);
 }
 
 extern void ip_ct_deliver_cached_events(const struct ip_conntrack *ct);
@@ -366,14 +363,14 @@ static inline void ip_conntrack_event(enum ip_conntrack_events event,
                                      struct ip_conntrack *ct)
 {
        if (is_confirmed(ct) && !is_dying(ct))
-               atomic_notifier_call_chain(&ip_conntrack_chain, event, ct);
+               notifier_call_chain(&ip_conntrack_chain, event, ct);
 }
 
 static inline void 
 ip_conntrack_expect_event(enum ip_conntrack_expect_events event,
                          struct ip_conntrack_expect *exp)
 {
-       atomic_notifier_call_chain(&ip_conntrack_expect_chain, event, exp);
+       notifier_call_chain(&ip_conntrack_expect_chain, event, exp);
 }
 #else /* CONFIG_IP_NF_CONNTRACK_EVENTS */
 static inline void ip_conntrack_event_cache(enum ip_conntrack_events event,