[IPV6]: ndisc_dst_alloc can never get a NULL dev.

aaecbc98 · David S. Miller · d6667fe4 · aaecbc98
Commit aaecbc98 authored May 31, 2004 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

net/ipv6/route.c net/ipv6/route.c +2 -3

No files found.
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -583,15 +583,14 @@ struct dst_entry *ndisc_dst_alloc(struct net_device *dev,
 	if (unlikely(rt == NULL))
 		goto out;

-	if (dev)
-		dev_hold(dev);
+	dev_hold(dev);
 	if (neigh)
 		neigh_hold(neigh);
 	else
 		neigh = ndisc_get_neigh(dev, addr);

 	rt->rt6i_dev	  = dev;
-	rt->rt6i_idev     = dev ? in6_dev_get(dev) : NULL;
+	rt->rt6i_idev     = in6_dev_get(dev);
 	rt->rt6i_nexthop  = neigh;
 	rt->rt6i_expires  = 0;
 	rt->rt6i_flags    = RTF_LOCAL;