diff options
| author |   Aaron Conole <aconole@bytheb.org> | 2017-04-12 16:32:54 -0400 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2017-04-14 01:54:23 +0200 |
| commit | 809c2d9a3b81f0ad9732d8ded0e91b3a97a81685 (patch) | |
| tree | af8f558c706d0d25045d1c79a4ff5d0bf693442e /net/netfilter/nf_conntrack_proto.c | |
| parent | netfilter: nf_tables: remove double return statement (diff) | |
| download | linux-dev-809c2d9a3b81f0ad9732d8ded0e91b3a97a81685.tar.xz linux-dev-809c2d9a3b81f0ad9732d8ded0e91b3a97a81685.zip | |
netfilter: nf_conntrack: remove double assignment
The protonet pointer will unconditionally be rewritten, so just do the
needed assignment first.
Signed-off-by: Aaron Conole <aconole@bytheb.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to '')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto.c | 3 |
1 files changed, 1 insertions, 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; |