projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5095d64
)
ethernet/broadcom: ip6_route_output() never returns NULL.
author
RongQing.Li
<roy.qing.li@gmail.com>
Tue, 21 Feb 2012 22:10:50 +0000
(22:10 +0000)
committer
David S. Miller
<davem@davemloft.net>
Wed, 22 Feb 2012 20:30:14 +0000
(15:30 -0500)
ip6_route_output() never returns NULL, so it is wrong to
check if the return value is NULL.
Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/cnic.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/cnic.c
b/drivers/net/ethernet/broadcom/cnic.c
index
dd3a0a2
..
818a573
100644
(file)
--- a/
drivers/net/ethernet/broadcom/cnic.c
+++ b/
drivers/net/ethernet/broadcom/cnic.c
@@
-3584,7
+3584,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