Commit 95a9a5ba authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller

[IPV6]: ROUTE: Split up rt6_cow() for future changes.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4fd30eb
...@@ -401,10 +401,9 @@ int ip6_ins_rt(struct rt6_info *rt, struct nlmsghdr *nlh, ...@@ -401,10 +401,9 @@ int ip6_ins_rt(struct rt6_info *rt, struct nlmsghdr *nlh,
with dst->error set to errno value. with dst->error set to errno value.
*/ */
static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr, static struct rt6_info *rt6_alloc_cow(struct rt6_info *ort, struct in6_addr *daddr,
struct in6_addr *saddr, struct netlink_skb_parms *req) struct in6_addr *saddr)
{ {
int err;
struct rt6_info *rt; struct rt6_info *rt;
/* /*
...@@ -435,18 +434,29 @@ static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr, ...@@ -435,18 +434,29 @@ static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
rt->rt6i_nexthop = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway); rt->rt6i_nexthop = ndisc_get_neigh(rt->rt6i_dev, &rt->rt6i_gateway);
dst_hold(&rt->u.dst); }
err = ip6_ins_rt(rt, NULL, NULL, req); return rt;
if (err == 0) }
return rt;
rt->u.dst.error = err; static struct rt6_info *rt6_cow(struct rt6_info *ort, struct in6_addr *daddr,
struct in6_addr *saddr, struct netlink_skb_parms *req)
{
struct rt6_info *rt = rt6_alloc_cow(ort, daddr, saddr);
int err;
return rt; if (!rt) {
dst_hold(&ip6_null_entry.u.dst);
return &ip6_null_entry;
} }
dst_hold(&ip6_null_entry.u.dst);
return &ip6_null_entry; dst_hold(&rt->u.dst);
err = ip6_ins_rt(rt, NULL, NULL, req);
if (err)
rt->u.dst.error = err;
return rt;
} }
#define BACKTRACK() \ #define BACKTRACK() \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment