Skip to content

Commit

Permalink
[IPV6] ROUTE: Use &rt->u.dst instead of cast.
Browse files Browse the repository at this point in the history
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
  • Loading branch information
YOSHIFUJI Hideaki authored and David S. Miller committed Dec 3, 2006
1 parent 33e93c9 commit 40aa7b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion net/ipv6/fib6_rules.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ struct dst_entry *fib6_rule_lookup(struct flowi *fl, int flags,
fib_rule_put(arg.rule);

if (arg.result)
return (struct dst_entry *) arg.result;
return arg.result;

dst_hold(&ip6_null_entry.u.dst);
return &ip6_null_entry.u.dst;
Expand Down
6 changes: 3 additions & 3 deletions net/ipv6/route.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ struct dst_entry *ndisc_dst_alloc(struct net_device *dev,
fib6_force_start_gc();

out:
return (struct dst_entry *)rt;
return &rt->u.dst;
}

int ndisc_dst_gc(int *more)
Expand Down Expand Up @@ -1223,7 +1223,7 @@ int ip6_route_add(struct fib6_config *cfg)
if (idev)
in6_dev_put(idev);
if (rt)
dst_free((struct dst_entry *) rt);
dst_free(&rt->u.dst);
return err;
}

Expand Down Expand Up @@ -1822,7 +1822,7 @@ struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
rt->rt6i_flags |= RTF_LOCAL;
rt->rt6i_nexthop = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
if (rt->rt6i_nexthop == NULL) {
dst_free((struct dst_entry *) rt);
dst_free(&rt->u.dst);
return ERR_PTR(-ENOMEM);
}

Expand Down

0 comments on commit 40aa7b9

Please sign in to comment.