From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Conole Subject: [PATCH nf-next] nf_conntrack: remove double assignment Date: Wed, 12 Apr 2017 16:32:54 -0400 Message-ID: <20170412203254.14625-1-aconole@bytheb.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Pablo Neira Ayuso , Jozsef Kadlecsik To: netfilter-devel@vger.kernel.org Return-path: Received: from mail-qk0-f194.google.com ([209.85.220.194]:36611 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755512AbdDLUdC (ORCPT ); Wed, 12 Apr 2017 16:33:02 -0400 Received: by mail-qk0-f194.google.com with SMTP id v75so5659318qkb.3 for ; Wed, 12 Apr 2017 13:33:01 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: The protonet pointer will unconditionally be rewritten, so just do the needed assignment first. Signed-off-by: Aaron Conole --- 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 2d6ee18..e6d2945 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.9.3