diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:13:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 14:13:16 +1100 |
| commit | e15246babb490d1285a70591b5544d57c427c4d5 (patch) | |
| tree | 974cb736e8c5049ed96d6fce94619d63fced84a7 /net/ipv6 | |
| parent | 37b9a1de57381e12e565bc5dda6be7528abbbb35 (diff) | |
| parent | 40b1f8f7b57f89ce2709a3d901a8f0bf3740fbcb (diff) | |
Merge remote-tracking branch 'rcu/rcu/next'
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b5d27212db2f..6d5140e29fb9 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1910,7 +1910,7 @@ struct proto tcpv6_prot = { .sysctl_rmem = sysctl_tcp_rmem, .max_header = MAX_TCP_HEADER, .obj_size = sizeof(struct tcp6_sock), - .slab_flags = SLAB_DESTROY_BY_RCU, + .slab_flags = SLAB_TYPESAFE_BY_RCU, .twsk_prot = &tcp6_timewait_sock_ops, .rsk_prot = &tcp6_request_sock_ops, .h.hashinfo = &tcp_hashinfo, |