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

Commit e0f802fb authored by Octavian Purdila's avatar Octavian Purdila Committed by David S. Miller
Browse files

tcp: move ir_mark initialization to tcp_openreq_init 



ir_mark initialization is done for both TCP v4 and v6, move it in the
common tcp_openreq_init function.

Signed-off-by: default avatarOctavian Purdila <octavian.purdila@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d215d10f

include/net/tcp.h

+2 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static inline int tcp_full_space(const struct sock *sk) 


static inline void tcp_openreq_init(struct request_sock *req,

				    struct tcp_options_received *rx_opt,

				    struct sk_buff *skb)

				    struct sk_buff *skb, struct sock *sk)

{

	struct inet_request_sock *ireq = inet_rsk(req);
@@ -1117,6 +1117,7 @@ static inline void tcp_openreq_init(struct request_sock *req, 
	ireq->ecn_ok = 0;

	ireq->ir_rmt_port = tcp_hdr(skb)->source;

	ireq->ir_num = ntohs(tcp_hdr(skb)->dest);

	ireq->ir_mark = inet_request_mark(sk, skb);

}



extern void tcp_openreq_init_rwin(struct request_sock *req,

net/ipv4/tcp_ipv4.c

+1 −2
Original line number Diff line number Diff line
@@ -1311,14 +1311,13 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) 
		tcp_clear_options(&tmp_opt);



	tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;

	tcp_openreq_init(req, &tmp_opt, skb);

	tcp_openreq_init(req, &tmp_opt, skb, sk);



	ireq = inet_rsk(req);

	ireq->ir_loc_addr = daddr;

	ireq->ir_rmt_addr = saddr;

	ireq->no_srccheck = inet_sk(sk)->transparent;

	ireq->opt = tcp_v4_save_options(skb);

	ireq->ir_mark = inet_request_mark(sk, skb);



	if (security_inet_conn_request(sk, skb, req))

		goto drop_and_free;

net/ipv6/tcp_ipv6.c

+1 −2
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
		tcp_clear_options(&tmp_opt);



	tmp_opt.tstamp_ok = tmp_opt.saw_tstamp;

	tcp_openreq_init(req, &tmp_opt, skb);

	tcp_openreq_init(req, &tmp_opt, skb, sk);



	ireq = inet_rsk(req);

	ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr;
@@ -1034,7 +1034,6 @@ static int tcp_v6_conn_request(struct sock *sk, struct sk_buff *skb) 
		TCP_ECN_create_request(req, skb, sock_net(sk));



	ireq->ir_iif = sk->sk_bound_dev_if;

	ireq->ir_mark = inet_request_mark(sk, skb);



	/* So that link locals have meaning */

	if (!sk->sk_bound_dev_if &&