Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9a5dcee authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv6: tcp: provide sk->sk_priority to ctl packets 



We can populate skb->priority for some ctl packets
instead of always using zero.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f6570d7

net/ipv6/tcp_ipv6.c

+9 −7
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { 
static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 seq,

				 u32 ack, u32 win, u32 tsval, u32 tsecr,

				 int oif, struct tcp_md5sig_key *key, int rst,

				 u8 tclass, __be32 label)

				 u8 tclass, __be32 label, u32 priority)

{

	const struct tcphdr *th = tcp_hdr(skb);

	struct tcphdr *t1;
@@ -909,7 +909,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32 
	if (!IS_ERR(dst)) {

		skb_dst_set(buff, dst);

		ip6_xmit(ctl_sk, buff, &fl6, fl6.flowi6_mark, NULL, tclass,

			 0);

			 priority);

		TCP_INC_STATS(net, TCP_MIB_OUTSEGS);

		if (rst)

			TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
@@ -932,6 +932,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) 
	struct sock *sk1 = NULL;

#endif

	__be32 label = 0;

	u32 priority = 0;

	struct net *net;

	int oif = 0;
@@ -992,6 +993,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) 
			trace_tcp_send_reset(sk, skb);

			if (np->repflow)

				label = ip6_flowlabel(ipv6h);

			priority = sk->sk_priority;

		}

		if (sk->sk_state == TCP_TIME_WAIT)

			label = cpu_to_be32(inet_twsk(sk)->tw_flowlabel);
@@ -1001,7 +1003,7 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) 
	}



	tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, key, 1, 0,

			     label);

			     label, priority);



#ifdef CONFIG_TCP_MD5SIG

out:
@@ -1012,10 +1014,10 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) 
static void tcp_v6_send_ack(const struct sock *sk, struct sk_buff *skb, u32 seq,

			    u32 ack, u32 win, u32 tsval, u32 tsecr, int oif,

			    struct tcp_md5sig_key *key, u8 tclass,

			    __be32 label)

			    __be32 label, u32 priority)

{

	tcp_v6_send_response(sk, skb, seq, ack, win, tsval, tsecr, oif, key, 0,

			     tclass, label);

			     tclass, label, priority);

}



static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb)
@@ -1027,7 +1029,7 @@ static void tcp_v6_timewait_ack(struct sock *sk, struct sk_buff *skb) 
			tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale,

			tcp_time_stamp_raw() + tcptw->tw_ts_offset,

			tcptw->tw_ts_recent, tw->tw_bound_dev_if, tcp_twsk_md5_key(tcptw),

			tw->tw_tclass, cpu_to_be32(tw->tw_flowlabel));

			tw->tw_tclass, cpu_to_be32(tw->tw_flowlabel), 0);



	inet_twsk_put(tw);

}
@@ -1050,7 +1052,7 @@ static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, 
			tcp_time_stamp_raw() + tcp_rsk(req)->ts_off,

			req->ts_recent, sk->sk_bound_dev_if,

			tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->saddr),

			0, 0);

			0, 0, sk->sk_priority);

}