From: Simon Horman <horms@verge.net.au>
Date: Fri, 19 Apr 2013 01:25:42 +0000 (+0900)
Subject: ipvs: Avoid shadowing net variable in ip_vs_leave()
X-Git-Tag: MMI-PSA29.97-13-9~14469^2~47^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9fd0fa7ac33bf073d81447b73d41c407fee54214;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ipvs: Avoid shadowing net variable in ip_vs_leave()

Flagged by sparse.
Compile and sparse tested only.

Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index a0d7bd342775..085b5880ab0d 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -584,9 +584,9 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
 #ifdef CONFIG_IP_VS_IPV6
 	if (svc->af == AF_INET6) {
 		if (!skb->dev) {
-			struct net *net = dev_net(skb_dst(skb)->dev);
+			struct net *net_ = dev_net(skb_dst(skb)->dev);
 
-			skb->dev = net->loopback_dev;
+			skb->dev = net_->loopback_dev;
 		}
 		icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
 	} else