diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 16:22:43 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:54 -0500 |
commit | 4c9483b2fb5d2548c3cc1fe03cdd4484ceeb5d1c (patch) | |
tree | c29c8070012cffb38fe249cf528589a675f622b1 /drivers/net/cnic.c | |
parent | 9cce96df5b76691712dba22e83ff5efe900361e1 (diff) |
ipv6: Convert to use flowi6 where applicable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cnic.c')
-rw-r--r-- | drivers/net/cnic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index c8922f69705..8cca60e4344 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c | |||
@@ -3424,14 +3424,14 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr, | |||
3424 | struct dst_entry **dst) | 3424 | struct dst_entry **dst) |
3425 | { | 3425 | { |
3426 | #if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE)) | 3426 | #if defined(CONFIG_IPV6) || (defined(CONFIG_IPV6_MODULE) && defined(MODULE)) |
3427 | struct flowi fl; | 3427 | struct flowi6 fl6; |
3428 | 3428 | ||
3429 | memset(&fl, 0, sizeof(fl)); | 3429 | memset(&fl6, 0, sizeof(fl6)); |
3430 | ipv6_addr_copy(&fl.fl6_dst, &dst_addr->sin6_addr); | 3430 | ipv6_addr_copy(&fl6.daddr, &dst_addr->sin6_addr); |
3431 | if (ipv6_addr_type(&fl.fl6_dst) & IPV6_ADDR_LINKLOCAL) | 3431 | if (ipv6_addr_type(&fl6.daddr) & IPV6_ADDR_LINKLOCAL) |
3432 | fl.flowi_oif = dst_addr->sin6_scope_id; | 3432 | fl6.flowi6_oif = dst_addr->sin6_scope_id; |
3433 | 3433 | ||
3434 | *dst = ip6_route_output(&init_net, NULL, &fl); | 3434 | *dst = ip6_route_output(&init_net, NULL, &fl6); |
3435 | if (*dst) | 3435 | if (*dst) |
3436 | return 0; | 3436 | return 0; |
3437 | #endif | 3437 | #endif |