aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/tcp.h
diff options
context:
space:
mode:
authorOctavian Purdila <octavian.purdila@intel.com>2014-06-17 04:25:37 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-17 18:30:54 -0400
commite0f802fbcaa3bffe4728e37a8fa1279b5d554173 (patch)
treecdaf083f9eafc6147a7cbe2c6658fa498ce4aa4f /include/net/tcp.h
parentd215d10f2d6bd41ce9d11a2707568bbb50d2c32e (diff)
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: Octavian Purdila <octavian.purdila@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tcp.h')
-rw-r--r--include/net/tcp.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 7286db80e8b8..06a3023080c0 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1098,7 +1098,7 @@ static inline int tcp_full_space(const struct sock *sk)
1098 1098
1099static inline void tcp_openreq_init(struct request_sock *req, 1099static inline void tcp_openreq_init(struct request_sock *req,
1100 struct tcp_options_received *rx_opt, 1100 struct tcp_options_received *rx_opt,
1101 struct sk_buff *skb) 1101 struct sk_buff *skb, struct sock *sk)
1102{ 1102{
1103 struct inet_request_sock *ireq = inet_rsk(req); 1103 struct inet_request_sock *ireq = inet_rsk(req);
1104 1104
@@ -1117,6 +1117,7 @@ static inline void tcp_openreq_init(struct request_sock *req,
1117 ireq->ecn_ok = 0; 1117 ireq->ecn_ok = 0;
1118 ireq->ir_rmt_port = tcp_hdr(skb)->source; 1118 ireq->ir_rmt_port = tcp_hdr(skb)->source;
1119 ireq->ir_num = ntohs(tcp_hdr(skb)->dest); 1119 ireq->ir_num = ntohs(tcp_hdr(skb)->dest);
1120 ireq->ir_mark = inet_request_mark(sk, skb);
1120} 1121}
1121 1122
1122extern void tcp_openreq_init_rwin(struct request_sock *req, 1123extern void tcp_openreq_init_rwin(struct request_sock *req,