net: Make dst_alloc() take more explicit initializations.

Now the dst->dev, dev->obsolete, and dst->flags values can
be specified as well.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 11 deletions

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 9f09d4fc2880..f489b081c25d 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1125,13 +1125,10 @@ make_route:
         if (dev_out->flags & IFF_LOOPBACK)
                 flags |= RTCF_LOCAL;
 
-        rt = dst_alloc(&dn_dst_ops, 0);
+        rt = dst_alloc(&dn_dst_ops, dev_out, 1, 0, DST_HOST);
         if (rt == NULL)
                 goto e_nobufs;
 
-        atomic_set(&rt->dst.__refcnt, 1);
-        rt->dst.flags   = DST_HOST;
-
         rt->fld.saddr        = oldflp->saddr;
         rt->fld.daddr        = oldflp->daddr;
         rt->fld.flowidn_oif  = oldflp->flowidn_oif;
@@ -1146,8 +1143,6 @@ make_route:
         rt->rt_dst_map    = fld.daddr;
         rt->rt_src_map    = fld.saddr;
 
-        rt->dst.dev = dev_out;
-        dev_hold(dev_out);
         rt->dst.neighbour = neigh;
         neigh = NULL;
 
@@ -1399,7 +1394,7 @@ static int dn_route_input_slow(struct sk_buff *skb)
         }
 
 make_route:
-        rt = dst_alloc(&dn_dst_ops, 0);
+        rt = dst_alloc(&dn_dst_ops, out_dev, 0, 0, DST_HOST);
         if (rt == NULL)
                 goto e_nobufs;
 
@@ -1419,9 +1414,7 @@ make_route:
         rt->fld.flowidn_iif  = in_dev->ifindex;
         rt->fld.flowidn_mark = fld.flowidn_mark;
 
-        rt->dst.flags = DST_HOST;
         rt->dst.neighbour = neigh;
-        rt->dst.dev = out_dev;
         rt->dst.lastuse = jiffies;
         rt->dst.output = dn_rt_bug;
         switch(res.type) {
@@ -1440,8 +1433,6 @@ make_route:
                         rt->dst.input = dst_discard;
         }
         rt->rt_flags = flags;
-        if (rt->dst.dev)
-                dev_hold(rt->dst.dev);
 
         err = dn_rt_set_next_hop(rt, &res);
         if (err)