From 0b3677e2a537f1befb7132d330a4b79f6bf40b2b Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Wed, 18 Mar 2009 17:30:50 +0100
Subject: [PATCH] --- yaml --- r: 135503 b: refs/heads/master c:
 711d60a9e7f88e394ccca10f5fc83f95f0cea5b1 h: refs/heads/master i:   135501:
 693f92b3e165cbeca3cbdf1f3895fb0b8ed262df   135499:
 cdcac7d30f9c0f550ed08e4f5fbdfb70f650300a   135495:
 29cea483ac55a35eaa2e1f91bf52c40560776197   135487:
 d1ecd8f65f5a3e873bfd8885ab9d7540c9764bea v: v3

---
 [refs]                                        |  2 +-
 .../net/netfilter/nf_conntrack_l4proto.h      |  5 -----
 trunk/net/netfilter/nf_conntrack_proto.c      | 21 -------------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 9a9cfe66e921..643a12681b33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd91566e4bdbcb8841385e4b2eacc8d0c29c9208
+refs/heads/master: 711d60a9e7f88e394ccca10f5fc83f95f0cea5b1
diff --git a/trunk/include/net/netfilter/nf_conntrack_l4proto.h b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
index 16ab604659e7..b01070bf2f84 100644
--- a/trunk/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
@@ -98,11 +98,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
 extern struct nf_conntrack_l4proto *
 __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
 
-extern struct nf_conntrack_l4proto *
-nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t protocol);
-
-extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
-
 /* Protocol registration. */
 extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
 extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
diff --git a/trunk/net/netfilter/nf_conntrack_proto.c b/trunk/net/netfilter/nf_conntrack_proto.c
index 592d73344d46..9a62b4efa0e1 100644
--- a/trunk/net/netfilter/nf_conntrack_proto.c
+++ b/trunk/net/netfilter/nf_conntrack_proto.c
@@ -74,27 +74,6 @@ EXPORT_SYMBOL_GPL(__nf_ct_l4proto_find);
 
 /* this is guaranteed to always return a valid protocol helper, since
  * it falls back to generic_protocol */
-struct nf_conntrack_l4proto *
-nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto)
-{
-	struct nf_conntrack_l4proto *p;
-
-	rcu_read_lock();
-	p = __nf_ct_l4proto_find(l3proto, l4proto);
-	if (!try_module_get(p->me))
-		p = &nf_conntrack_l4proto_generic;
-	rcu_read_unlock();
-
-	return p;
-}
-EXPORT_SYMBOL_GPL(nf_ct_l4proto_find_get);
-
-void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p)
-{
-	module_put(p->me);
-}
-EXPORT_SYMBOL_GPL(nf_ct_l4proto_put);
-
 struct nf_conntrack_l3proto *
 nf_ct_l3proto_find_get(u_int16_t l3proto)
 {