linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / net / netfilter / nf_conntrack_compat.h

diff --git a/include/net/netfilter/nf_conntrack_compat.h b/include/net/netfilter/nf_conntrack_compat.h
index f1b1482..3cac19f 100644 (file)
--- a/include/net/netfilter/nf_conntrack_compat.h
+++ b/include/net/netfilter/nf_conntrack_compat.h
@@ -20,19 +20,6 @@ static inline u_int32_t *nf_ct_get_mark(const struct sk_buff *skb,
 }
 #endif /* CONFIG_IP_NF_CONNTRACK_MARK */
 
-#ifdef CONFIG_IP_NF_CONNTRACK_SECMARK
-static inline u_int32_t *nf_ct_get_secmark(const struct sk_buff *skb,
-                                          u_int32_t *ctinfo)
-{
-       struct ip_conntrack *ct = ip_conntrack_get(skb, ctinfo);
-
-       if (ct)
-               return &ct->secmark;
-       else
-               return NULL;
-}
-#endif /* CONFIG_IP_NF_CONNTRACK_SECMARK */
-
 #ifdef CONFIG_IP_NF_CT_ACCT
 static inline struct ip_conntrack_counter *
 nf_ct_get_counters(const struct sk_buff *skb)
@@ -83,19 +70,6 @@ static inline u_int32_t *nf_ct_get_mark(const struct sk_buff *skb,
 }
 #endif /* CONFIG_NF_CONNTRACK_MARK */
 
-#ifdef CONFIG_NF_CONNTRACK_SECMARK
-static inline u_int32_t *nf_ct_get_secmark(const struct sk_buff *skb,
-                                          u_int32_t *ctinfo)
-{
-       struct nf_conn *ct = nf_ct_get(skb, ctinfo);
-
-       if (ct)
-               return &ct->secmark;
-       else
-               return NULL;
-}
-#endif /* CONFIG_NF_CONNTRACK_MARK */
-
 #ifdef CONFIG_NF_CT_ACCT
 static inline struct ip_conntrack_counter *
 nf_ct_get_counters(const struct sk_buff *skb)