diff options
Diffstat (limited to 'net/ipv6/inet6_connection_sock.c')
-rw-r--r-- | net/ipv6/inet6_connection_sock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 1567fb120392..02dd203d9eac 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c | |||
@@ -65,9 +65,9 @@ struct dst_entry *inet6_csk_route_req(struct sock *sk, | |||
65 | 65 | ||
66 | memset(&fl6, 0, sizeof(fl6)); | 66 | memset(&fl6, 0, sizeof(fl6)); |
67 | fl6.flowi6_proto = IPPROTO_TCP; | 67 | fl6.flowi6_proto = IPPROTO_TCP; |
68 | ipv6_addr_copy(&fl6.daddr, &treq->rmt_addr); | 68 | fl6.daddr = treq->rmt_addr; |
69 | final_p = fl6_update_dst(&fl6, np->opt, &final); | 69 | final_p = fl6_update_dst(&fl6, np->opt, &final); |
70 | ipv6_addr_copy(&fl6.saddr, &treq->loc_addr); | 70 | fl6.saddr = treq->loc_addr; |
71 | fl6.flowi6_oif = sk->sk_bound_dev_if; | 71 | fl6.flowi6_oif = sk->sk_bound_dev_if; |
72 | fl6.flowi6_mark = sk->sk_mark; | 72 | fl6.flowi6_mark = sk->sk_mark; |
73 | fl6.fl6_dport = inet_rsk(req)->rmt_port; | 73 | fl6.fl6_dport = inet_rsk(req)->rmt_port; |
@@ -157,7 +157,7 @@ void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr) | |||
157 | struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) uaddr; | 157 | struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) uaddr; |
158 | 158 | ||
159 | sin6->sin6_family = AF_INET6; | 159 | sin6->sin6_family = AF_INET6; |
160 | ipv6_addr_copy(&sin6->sin6_addr, &np->daddr); | 160 | sin6->sin6_addr = np->daddr; |
161 | sin6->sin6_port = inet_sk(sk)->inet_dport; | 161 | sin6->sin6_port = inet_sk(sk)->inet_dport; |
162 | /* We do not store received flowlabel for TCP */ | 162 | /* We do not store received flowlabel for TCP */ |
163 | sin6->sin6_flowinfo = 0; | 163 | sin6->sin6_flowinfo = 0; |
@@ -215,8 +215,8 @@ int inet6_csk_xmit(struct sk_buff *skb, struct flowi *fl_unused) | |||
215 | 215 | ||
216 | memset(&fl6, 0, sizeof(fl6)); | 216 | memset(&fl6, 0, sizeof(fl6)); |
217 | fl6.flowi6_proto = sk->sk_protocol; | 217 | fl6.flowi6_proto = sk->sk_protocol; |
218 | ipv6_addr_copy(&fl6.daddr, &np->daddr); | 218 | fl6.daddr = np->daddr; |
219 | ipv6_addr_copy(&fl6.saddr, &np->saddr); | 219 | fl6.saddr = np->saddr; |
220 | fl6.flowlabel = np->flow_label; | 220 | fl6.flowlabel = np->flow_label; |
221 | IP6_ECN_flow_xmit(sk, fl6.flowlabel); | 221 | IP6_ECN_flow_xmit(sk, fl6.flowlabel); |
222 | fl6.flowi6_oif = sk->sk_bound_dev_if; | 222 | fl6.flowi6_oif = sk->sk_bound_dev_if; |
@@ -246,7 +246,7 @@ int inet6_csk_xmit(struct sk_buff *skb, struct flowi *fl_unused) | |||
246 | skb_dst_set_noref(skb, dst); | 246 | skb_dst_set_noref(skb, dst); |
247 | 247 | ||
248 | /* Restore final destination back after routing done */ | 248 | /* Restore final destination back after routing done */ |
249 | ipv6_addr_copy(&fl6.daddr, &np->daddr); | 249 | fl6.daddr = np->daddr; |
250 | 250 | ||
251 | res = ip6_xmit(sk, skb, &fl6, np->opt, np->tclass); | 251 | res = ip6_xmit(sk, skb, &fl6, np->opt, np->tclass); |
252 | rcu_read_unlock(); | 252 | rcu_read_unlock(); |