| Message ID | 1340515324-2152-2-git-send-email-ncardwell@google.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, 2012-06-24 at 01:22 -0400, Neal Cardwell wrote: > Fix inet6_csk_route_req() to use as the flowi6_oif the treq->iif, > which is correctly fixed up in tcp_v6_conn_request() to handle the > case of link-local addresses. This brings it in line with the > tcp_v6_send_synack() code, which is already correctly using the > treq->iif in this way. > > Signed-off-by: Neal Cardwell <ncardwell@google.com> > --- > net/ipv6/inet6_connection_sock.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c > index e6cee52..e23d354 100644 > --- a/net/ipv6/inet6_connection_sock.c > +++ b/net/ipv6/inet6_connection_sock.c > @@ -68,7 +68,7 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk, > fl6.daddr = treq->rmt_addr; > final_p = fl6_update_dst(&fl6, np->opt, &final); > fl6.saddr = treq->loc_addr; > - fl6.flowi6_oif = sk->sk_bound_dev_if; > + fl6.flowi6_oif = treq->iif; > fl6.flowi6_mark = sk->sk_mark; > fl6.fl6_dport = inet_rsk(req)->rmt_port; > fl6.fl6_sport = inet_rsk(req)->loc_port; Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index e6cee52..e23d354 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c @@ -68,7 +68,7 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk, fl6.daddr = treq->rmt_addr; final_p = fl6_update_dst(&fl6, np->opt, &final); fl6.saddr = treq->loc_addr; - fl6.flowi6_oif = sk->sk_bound_dev_if; + fl6.flowi6_oif = treq->iif; fl6.flowi6_mark = sk->sk_mark; fl6.fl6_dport = inet_rsk(req)->rmt_port; fl6.fl6_sport = inet_rsk(req)->loc_port;
Fix inet6_csk_route_req() to use as the flowi6_oif the treq->iif, which is correctly fixed up in tcp_v6_conn_request() to handle the case of link-local addresses. This brings it in line with the tcp_v6_send_synack() code, which is already correctly using the treq->iif in this way. Signed-off-by: Neal Cardwell <ncardwell@google.com> --- net/ipv6/inet6_connection_sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)