diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-23 15:29:43 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-23 15:29:43 +0300 |
| commit | 7706abf5a0eb4c082897fd2a17a0ac0898e39666 (patch) | |
| tree | 982d22365f1aeedc43a796ef816cf1b1fa8480a7 /net/ipv4/tcp_input.c | |
| parent | ca3c5858834f75543a4e2e115b1578c01558b2ce (diff) | |
| parent | bb176f67090ca54869fc1262c913aa69d2ede070 (diff) | |
| download | linux-7706abf5a0eb4c082897fd2a17a0ac0898e39666.tar.xz | |
Merge 4.14-rc6 into staging-next
We want the IIO and staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c5d7656beeee..7eec3383702b 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -6196,7 +6196,7 @@ struct request_sock *inet_reqsk_alloc(const struct request_sock_ops *ops, struct inet_request_sock *ireq = inet_rsk(req); kmemcheck_annotate_bitfield(ireq, flags); - ireq->opt = NULL; + ireq->ireq_opt = NULL; #if IS_ENABLED(CONFIG_IPV6) ireq->pktopts = NULL; #endif |