summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Horman2013-04-19 03:25:42 +0200
committerSimon Horman2013-04-23 04:43:06 +0200
commit9fd0fa7ac33bf073d81447b73d41c407fee54214 (patch)
tree8b95c78d6380cc650719e2977d2025026b6ddf3a
parentipvs: fix sparse warnings for some parameters (diff)
downloadkernel-qcow2-linux-9fd0fa7ac33bf073d81447b73d41c407fee54214.tar.gz
kernel-qcow2-linux-9fd0fa7ac33bf073d81447b73d41c407fee54214.tar.xz
kernel-qcow2-linux-9fd0fa7ac33bf073d81447b73d41c407fee54214.zip
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>
-rw-r--r--net/netfilter/ipvs/ip_vs_core.c4
1 files changed, 2 insertions, 2 deletions
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