forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipv6: introduce ip6_rt_put()

Browse source 
As suggested by Eric, we could introduce a helper function
for ipv6 too, to avoid checking if rt is NULL before
dst_release().

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amerigo Wang 2012-10-29 00:13:19 +00:00 • committed by David S. Miller
parent 6da025fa23
commit 94e187c015
11 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
net/ipv6/ndisc.c
View file

@ -1145,7 +1145,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
ND_PRINTK(0, err,
"RA: %s got default router without neighbour\n",
__func__);
dst_release(&rt->dst);
ip6_rt_put(rt);
return;
}
}
@ -1170,7 +1170,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
ND_PRINTK(0, err,
"RA: %s got default router without neighbour\n",
__func__);
dst_release(&rt->dst);
ip6_rt_put(rt);
return;
}
neigh->flags |= NTF_ROUTER;
@ -1326,8 +1326,7 @@ skip_routeinfo:
ND_PRINTK(2, warn, "RA: invalid RA options\n");
}
out:
if (rt)
dst_release(&rt->dst);
ip6_rt_put(rt);
if (neigh)
neigh_release(neigh);
}