All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ido Schimmel <idosch@OSS.NVIDIA.COM>
To: <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <kuba@kernel.org>, <dsahern@gmail.com>,
	<petrm@OSS.NVIDIA.COM>, <roopa@OSS.NVIDIA.COM>,
	<nikolay@OSS.NVIDIA.COM>, <ssuryaextr@gmail.com>,
	<mlxsw@OSS.NVIDIA.COM>, Ido Schimmel <idosch@OSS.NVIDIA.COM>
Subject: [PATCH net-next 04/10] ipv6: Use a more suitable label name
Date: Mon, 17 May 2021 21:15:20 +0300	[thread overview]
Message-ID: <20210517181526.193786-5-idosch@nvidia.com> (raw)
In-Reply-To: <20210517181526.193786-1-idosch@nvidia.com>

The 'out_timer' label was added in commit 63152fc0de4d ("[NETNS][IPV6]
ip6_fib - gc timer per namespace") when the timer was allocated on the
heap.

Commit 417f28bb3407 ("netns: dont alloc ipv6 fib timer list") removed
the allocation, but kept the label name.

Rename it to a more suitable name.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
---
 net/ipv6/ip6_fib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 679699e953f1..33d2d6a4e28c 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -2362,7 +2362,7 @@ static int __net_init fib6_net_init(struct net *net)
 
 	net->ipv6.rt6_stats = kzalloc(sizeof(*net->ipv6.rt6_stats), GFP_KERNEL);
 	if (!net->ipv6.rt6_stats)
-		goto out_timer;
+		goto out_notifier;
 
 	/* Avoid false sharing : Use at least a full cache line */
 	size = max_t(size_t, size, L1_CACHE_BYTES);
@@ -2407,7 +2407,7 @@ static int __net_init fib6_net_init(struct net *net)
 	kfree(net->ipv6.fib_table_hash);
 out_rt6_stats:
 	kfree(net->ipv6.rt6_stats);
-out_timer:
+out_notifier:
 	fib6_notifier_exit(net);
 	return -ENOMEM;
 }
-- 
2.31.1


  parent reply	other threads:[~2021-05-17 18:16 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17 18:15 [PATCH net-next 00/10] Add support for custom multipath hash Ido Schimmel
2021-05-17 18:15 ` [PATCH net-next 01/10] ipv4: Calculate multipath hash inside switch statement Ido Schimmel
2021-05-18  1:39   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 02/10] ipv4: Add a sysctl to control multipath hash fields Ido Schimmel
2021-05-18  1:41   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 03/10] ipv4: Add custom multipath hash policy Ido Schimmel
2021-05-18  1:42   ` David Ahern
2021-05-17 18:15 ` Ido Schimmel [this message]
2021-05-18  1:43   ` [PATCH net-next 04/10] ipv6: Use a more suitable label name David Ahern
2021-05-17 18:15 ` [PATCH net-next 05/10] ipv6: Calculate multipath hash inside switch statement Ido Schimmel
2021-05-18  1:43   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 06/10] ipv6: Add a sysctl to control multipath hash fields Ido Schimmel
2021-05-18  1:44   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 07/10] ipv6: Add custom multipath hash policy Ido Schimmel
2021-05-18  1:45   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 08/10] selftests: forwarding: Add test for custom multipath hash Ido Schimmel
2021-05-18  1:48   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 09/10] selftests: forwarding: Add test for custom multipath hash with IPv4 GRE Ido Schimmel
2021-05-18  1:50   ` David Ahern
2021-05-17 18:15 ` [PATCH net-next 10/10] selftests: forwarding: Add test for custom multipath hash with IPv6 GRE Ido Schimmel
2021-05-18  1:50   ` David Ahern
2021-05-18 20:50 ` [PATCH net-next 00/10] Add support for custom multipath hash patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210517181526.193786-5-idosch@nvidia.com \
    --to=idosch@oss.nvidia.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@gmail.com \
    --cc=kuba@kernel.org \
    --cc=mlxsw@OSS.NVIDIA.COM \
    --cc=netdev@vger.kernel.org \
    --cc=nikolay@OSS.NVIDIA.COM \
    --cc=petrm@OSS.NVIDIA.COM \
    --cc=roopa@OSS.NVIDIA.COM \
    --cc=ssuryaextr@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.