From 2160b2d6a1e9ea8b84486ccf6b79b91b593ee8ae Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Mon, 24 Apr 2006 17:15:17 -0700
Subject: [PATCH] --- yaml --- r: 26167 b: refs/heads/master c:
 e1bbdebdba615ddd957de81103aa2f7fa0581952 h: refs/heads/master i:   26165:
 c4b35d8997d087b65828b0b35f5fb557fc9039e7   26163:
 123c5db3a8adfce54692eac1cb1110d4fe86e4a9   26159:
 8c573ecdfc97e59b436272cc26fdf54a63d55a1c v: v3

---
 [refs]                                             |  2 +-
 trunk/net/netfilter/nf_conntrack_core.c            | 12 ++++--------
 trunk/net/netfilter/nf_conntrack_l3proto_generic.c |  1 -
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4a1dedb1d340..af3d1df7af81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8fe3f19203b1f5070358aaa292d33295258b448
+refs/heads/master: e1bbdebdba615ddd957de81103aa2f7fa0581952
diff --git a/trunk/net/netfilter/nf_conntrack_core.c b/trunk/net/netfilter/nf_conntrack_core.c
index e581190fb6c3..e3022226a408 100644
--- a/trunk/net/netfilter/nf_conntrack_core.c
+++ b/trunk/net/netfilter/nf_conntrack_core.c
@@ -208,10 +208,8 @@ nf_ct_proto_find_get(u_int16_t l3proto, u_int8_t protocol)
 
 	preempt_disable();
 	p = __nf_ct_proto_find(l3proto, protocol);
-	if (p) {
-		if (!try_module_get(p->me))
-			p = &nf_conntrack_generic_protocol;
-	}
+	if (!try_module_get(p->me))
+		p = &nf_conntrack_generic_protocol;
 	preempt_enable();
 	
 	return p;
@@ -229,10 +227,8 @@ nf_ct_l3proto_find_get(u_int16_t l3proto)
 
 	preempt_disable();
 	p = __nf_ct_l3proto_find(l3proto);
-	if (p) {
-		if (!try_module_get(p->me))
-			p = &nf_conntrack_generic_l3proto;
-	}
+	if (!try_module_get(p->me))
+		p = &nf_conntrack_generic_l3proto;
 	preempt_enable();
 
 	return p;
diff --git a/trunk/net/netfilter/nf_conntrack_l3proto_generic.c b/trunk/net/netfilter/nf_conntrack_l3proto_generic.c
index 7de4f06c63c5..3fc58e454d4e 100644
--- a/trunk/net/netfilter/nf_conntrack_l3proto_generic.c
+++ b/trunk/net/netfilter/nf_conntrack_l3proto_generic.c
@@ -94,5 +94,4 @@ struct nf_conntrack_l3proto nf_conntrack_generic_l3proto = {
 	.print_conntrack = generic_print_conntrack,
 	.prepare	 = generic_prepare,
 	.get_features	 = generic_get_features,
-	.me		 = THIS_MODULE,
 };