---

yaml --- r: 225198 b: refs/heads/master c: bc3ef66 h: refs/heads/master v: v3
git-mirror · Dec 19, 2010 · 3b1def2 · 3b1def2
1 parent 5715e69
commit 3b1def2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4aa9e05a61b845541fa6f5b1d246976922601f0
+refs/heads/master: bc3ef6605ea325e41b586a76aadc3f731c317504
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -2009,11 +2009,11 @@ struct arg_dev_net {
 
 static int fib6_ifdown(struct rt6_info *rt, void *arg)
 {
-	struct net_device *dev = ((struct arg_dev_net *)arg)->dev;
-	struct net *net = ((struct arg_dev_net *)arg)->net;
+	const struct arg_dev_net *adn = arg;
+	const struct net_device *dev = adn->dev;
 
-	if (((void *)rt->rt6i_dev == dev || dev == NULL) &&
-	    rt != net->ipv6.ip6_null_entry) {
+	if ((rt->rt6i_dev == dev || dev == NULL) &&
+	    rt != adn->net->ipv6.ip6_null_entry) {
 		RT6_TRACE("deleted by ifdown %p\n", rt);
 		return -1;
 	}