* [PATCH nf-next] nf_conntrack: remove double assignment
@ 2017-04-12 20:32 Aaron Conole
2017-04-13 23:27 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Aaron Conole @ 2017-04-12 20:32 UTC (permalink / raw)
To: netfilter-devel; +Cc: netdev, linux-kernel, Pablo Neira Ayuso, Jozsef Kadlecsik
The protonet pointer will unconditionally be rewritten, so just do the
needed assignment first.
Signed-off-by: Aaron Conole <aconole@bytheb.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 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH nf-next] nf_conntrack: remove double assignment
2017-04-12 20:32 [PATCH nf-next] nf_conntrack: remove double assignment Aaron Conole
@ 2017-04-13 23:27 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-04-13 23:27 UTC (permalink / raw)
To: Aaron Conole; +Cc: netfilter-devel, netdev, linux-kernel, Jozsef Kadlecsik
On Wed, Apr 12, 2017 at 04:32:54PM -0400, Aaron Conole wrote:
> The protonet pointer will unconditionally be rewritten, so just do the
> needed assignment first.
Also applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-13 23:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-12 20:32 [PATCH nf-next] nf_conntrack: remove double assignment Aaron Conole
2017-04-13 23:27 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).