]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ethernet/broadcom: ip6_route_output() never returns NULL.
authorRongQing.Li <roy.qing.li@gmail.com>
Tue, 21 Feb 2012 22:10:50 +0000 (22:10 +0000)
committerJoe Jin <joe.jin@oracle.com>
Tue, 28 Aug 2012 07:23:14 +0000 (15:23 +0800)
ip6_route_output() never returns NULL, so it is wrong to
check if the return value is NULL.

(cherry picked from commit 0541743b4b35f2ddc9e490b4e354930168b60d23)
Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/cnic.c

index 291bf6da642b61a209b1e3d74e4c8ed200d7aac2..2d7660d8396bf3a775837b7fb795ca2c6af2135a 100644 (file)
@@ -3617,7 +3617,11 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
                fl6.flowi6_oif = dst_addr->sin6_scope_id;
 
        *dst = ip6_route_output(&init_net, NULL, &fl6);
-       if (*dst)
+       if ((*dst)->error) {
+               dst_release(*dst);
+               *dst = NULL;
+               return -ENETUNREACH;
+       } else
                return 0;
 #endif