diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 09:33:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 09:33:44 -0800 |
| commit | 990b07d952bff7116ba79e3c4ceeae5dd8d5ec3d (patch) | |
| tree | b0f6c896749f5beca20d74e72e4761aaa9e8ad2b /drivers/net/ethernet/broadcom/cnic.c | |
| parent | 3a70b7e05f62d4e1bfd5744368ea1fd855b6e03c (diff) | |
| parent | 8a16a701ad787b6db2949766341c5ad1b551de9f (diff) | |
Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers
* 'regulator' of git://github.com/hzhuang1/linux: (2 commits)
regulator: Remove bq24022 regulator driver
pxa: magician/hx4700: Convert to gpio-regulator from bq24022
(plus update to v3.3-rc6)
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index dd3a0a232ea0..818a573669e6 100644 --- 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 |