diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-11 03:41:37 -0400 |
| commit | 92254d31444aad272155f7963e65910c402703dd (patch) | |
| tree | 8e454ebe60cbac9a71b1771d4e471cfe54826963 /net/ipv6/tcp_ipv6.c | |
| parent | 707ecec1dc80d54163356a25d145c62083e7be60 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into x86/mce
Merge Linux 3.5-rc6 before merging more code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 3a9aec29581a..9df64a50b075 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1212,7 +1212,8 @@ have_isn: | |||
| 1212 | tcp_rsk(req)->snt_isn = isn; | 1212 | tcp_rsk(req)->snt_isn = isn; |
| 1213 | tcp_rsk(req)->snt_synack = tcp_time_stamp; | 1213 | tcp_rsk(req)->snt_synack = tcp_time_stamp; |
| 1214 | 1214 | ||
| 1215 | security_inet_conn_request(sk, skb, req); | 1215 | if (security_inet_conn_request(sk, skb, req)) |
| 1216 | goto drop_and_release; | ||
| 1216 | 1217 | ||
| 1217 | if (tcp_v6_send_synack(sk, req, | 1218 | if (tcp_v6_send_synack(sk, req, |
| 1218 | (struct request_values *)&tmp_ext, | 1219 | (struct request_values *)&tmp_ext, |