leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: delete useless dst check in ip6_dst_lookup_tail

Browse Source 
parameter dst always points to null.

Signed-off-by: zhang kai <zhangkaiheb@126.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
zhang kai 2021-06-24 11:09:14 +08:00 committed by David S. Miller
parent 911bd1b1f0
commit c305b9e6d5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv6/ip6_output.c
View File

@ -1055,13 +1055,11 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,
* ip6_route_output will fail given src=any saddr, though, so * ip6_route_output will fail given src=any saddr, though, so
* that's why we try it again later. * that's why we try it again later.
*/ */
if (ipv6_addr_any(&fl6->saddr) && (!*dst || !(*dst)->error)) { if (ipv6_addr_any(&fl6->saddr)) {
struct fib6_info *from; struct fib6_info *from;
struct rt6_info *rt; struct rt6_info *rt;
bool had_dst = *dst != NULL;
if (!had_dst) *dst = ip6_route_output(net, sk, fl6);
*dst = ip6_route_output(net, sk, fl6);
rt = (*dst)->error ? NULL : (struct rt6_info *)*dst; rt = (*dst)->error ? NULL : (struct rt6_info *)*dst;
rcu_read_lock(); rcu_read_lock();
@ -1078,7 +1076,7 @@ static int ip6_dst_lookup_tail(struct net *net, const struct sock *sk,
* never existed and let the SA-enabled version take * never existed and let the SA-enabled version take
* over. * over.
*/ */
if (!had_dst && (*dst)->error) { if ((*dst)->error) {
dst_release(*dst); dst_release(*dst);
*dst = NULL; *dst = NULL;
} }