|
@@ -663,22 +663,23 @@ static bool tcp_v6_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb)
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
-static void tcp_v6_init_req(struct request_sock *req, struct sock *sk,
|
|
|
+static void tcp_v6_init_req(struct request_sock *req,
|
|
|
+ const struct sock *sk_listener,
|
|
|
struct sk_buff *skb)
|
|
|
{
|
|
|
struct inet_request_sock *ireq = inet_rsk(req);
|
|
|
- struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
+ const struct ipv6_pinfo *np = inet6_sk(sk_listener);
|
|
|
|
|
|
ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;
|
|
|
ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr;
|
|
|
|
|
|
/* So that link locals have meaning */
|
|
|
- if (!sk->sk_bound_dev_if &&
|
|
|
+ if (!sk_listener->sk_bound_dev_if &&
|
|
|
ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL)
|
|
|
ireq->ir_iif = tcp_v6_iif(skb);
|
|
|
|
|
|
if (!TCP_SKB_CB(skb)->tcp_tw_isn &&
|
|
|
- (ipv6_opt_accepted(sk, skb, &TCP_SKB_CB(skb)->header.h6) ||
|
|
|
+ (ipv6_opt_accepted(sk_listener, skb, &TCP_SKB_CB(skb)->header.h6) ||
|
|
|
np->rxopt.bits.rxinfo ||
|
|
|
np->rxopt.bits.rxoinfo || np->rxopt.bits.rxhlim ||
|
|
|
np->rxopt.bits.rxohlim || np->repflow)) {
|