[PATCH 19/53] netfilter: nf_conntrack: remove double assignment

[Pablo Neira Ayuso]

From: Aaron Conole <acon...@bytheb.org>

The protonet pointer will unconditionally be rewritten, so just do the
needed assignment first.

Signed-off-by: Aaron Conole <acon...@bytheb.org>
Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
---
 net/netfilter/nf_conntrack_proto.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/netfilter/nf_conntrack_proto.c 
b/net/netfilter/nf_conntrack_proto.c
index 1329e090fd5e..2de6c1fe3261 100644
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -441,9 +441,8 @@ EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister_one);
 void nf_ct_l4proto_pernet_unregister_one(struct net *net,
                                         struct nf_conntrack_l4proto *l4proto)
 {
-       struct nf_proto_net *pn = NULL;
+       struct nf_proto_net *pn = nf_ct_l4proto_net(net, l4proto);
 
-       pn = nf_ct_l4proto_net(net, l4proto);
        if (pn == NULL)
                return;
 
-- 
2.1.4