Commit 4053ab1b authored Nov 07, 2016 by Arnd Bergmann Committed by David S. Miller Nov 09, 2016

vxlan: hide unused local variable



A bugfix introduced a harmless warning in v4.9-rc4:

drivers/net/vxlan.c: In function 'vxlan_group_used':
drivers/net/vxlan.c:947:21: error: unused variable 'sock6' [-Werror=unused-variable]

This hides the variable inside of the same #ifdef that is
around its user. The extraneous initialization is removed
at the same time, it was accidentally introduced in the
same commit.

Fixes: c6fcc4fc ("vxlan: avoid using stale vxlan socket.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 6dbcd8fb

drivers/net/vxlan.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -944,7 +944,9 @@ static bool vxlan_group_used(struct vxlan_net vn, struct vxlan_dev dev)
		{
		struct vxlan_dev *vxlan;
		struct vxlan_sock *sock4;
		struct vxlan_sock *sock6 = NULL;
		#if IS_ENABLED(CONFIG_IPV6)
		struct vxlan_sock *sock6;
		#endif
		unsigned short family = dev->default_dst.remote_ip.sa.sa_family;

		sock4 = rtnl_dereference(dev->vn4_sock);

Admin message