|
@@ -476,7 +476,8 @@ out:
|
|
|
|
|
|
|
|
|
|
static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req,
|
|
static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req,
|
|
- struct request_values *rvp)
|
|
|
|
|
|
+ struct request_values *rvp,
|
|
|
|
+ u16 queue_mapping)
|
|
{
|
|
{
|
|
struct inet6_request_sock *treq = inet6_rsk(req);
|
|
struct inet6_request_sock *treq = inet6_rsk(req);
|
|
struct ipv6_pinfo *np = inet6_sk(sk);
|
|
struct ipv6_pinfo *np = inet6_sk(sk);
|
|
@@ -513,6 +514,7 @@ static int tcp_v6_send_synack(struct sock *sk, struct request_sock *req,
|
|
__tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr);
|
|
__tcp_v6_send_check(skb, &treq->loc_addr, &treq->rmt_addr);
|
|
|
|
|
|
fl6.daddr = treq->rmt_addr;
|
|
fl6.daddr = treq->rmt_addr;
|
|
|
|
+ skb_set_queue_mapping(skb, queue_mapping);
|
|
err = ip6_xmit(sk, skb, &fl6, opt, np->tclass);
|
|
err = ip6_xmit(sk, skb, &fl6, opt, np->tclass);
|
|
err = net_xmit_eval(err);
|
|
err = net_xmit_eval(err);
|
|
}
|
|
}
|
|
@@ -528,7 +530,7 @@ static int tcp_v6_rtx_synack(struct sock *sk, struct request_sock *req,
|
|
struct request_values *rvp)
|
|
struct request_values *rvp)
|
|
{
|
|
{
|
|
TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);
|
|
TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_RETRANSSEGS);
|
|
- return tcp_v6_send_synack(sk, req, rvp);
|
|
|
|
|
|
+ return tcp_v6_send_synack(sk, req, rvp, 0);
|
|
}
|
|
}
|
|
|
|
|
|
static void tcp_v6_reqsk_destructor(struct request_sock *req)
|
|
static void tcp_v6_reqsk_destructor(struct request_sock *req)
|
|
@@ -1213,7 +1215,8 @@ have_isn:
|
|
security_inet_conn_request(sk, skb, req);
|
|
security_inet_conn_request(sk, skb, req);
|
|
|
|
|
|
if (tcp_v6_send_synack(sk, req,
|
|
if (tcp_v6_send_synack(sk, req,
|
|
- (struct request_values *)&tmp_ext) ||
|
|
|
|
|
|
+ (struct request_values *)&tmp_ext,
|
|
|
|
+ skb_get_queue_mapping(skb)) ||
|
|
want_cookie)
|
|
want_cookie)
|
|
goto drop_and_free;
|
|
goto drop_and_free;
|
|
|
|
|