diff options
| author | Octavian Purdila <[email protected]> | 2014-06-17 08:25:37 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-06-17 22:30:54 +0000 |
| commit | e0f802fbcaa3bffe4728e37a8fa1279b5d554173 (patch) | |
| tree | cdaf083f9eafc6147a7cbe2c6658fa498ce4aa4f /net/ipv4/tcp_ipv4.c | |
| parent | net: delete duplicate dev_set_rx_mode() call (diff) | |
| download | kernel-e0f802fbcaa3bffe4728e37a8fa1279b5d554173.tar.gz kernel-e0f802fbcaa3bffe4728e37a8fa1279b5d554173.zip | |
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 77cccda1ad0c..180336d47df6 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -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; |