diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-08-01 10:03:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 10:03:17 -0700 |
| commit | bb1182bc3e5956a93ab3ef8a3cbfb7966c42a94a (patch) | |
| tree | 434e1071679b5a6280155293de74fd5cd81c5dc5 /net/ipv6/tcp_ipv6.c | |
| parent | ipv6: Avoid going through ->sk_net to access the netns (diff) | |
| parent | Revert "l2tp: constify inet6_protocol structures" (diff) | |
| download | wireguard-linux-bb1182bc3e5956a93ab3ef8a3cbfb7966c42a94a.tar.xz wireguard-linux-bb1182bc3e5956a93ab3ef8a3cbfb7966c42a94a.zip | |
Merge branch 'revert-ipv6-const'
Julia Lawall says:
====================
Revert "ipv6: constify inet6_protocol structures"
inet6_add_protocol and inet6_del_protocol include casts that remove the
effect of the const annotation on their parameter, leading to possible
runtime crashes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -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 39ee8e7fc4bd..ced5dcf37465 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1944,7 +1944,7 @@ struct proto tcpv6_prot = { .diag_destroy = tcp_abort, }; -static const struct inet6_protocol tcpv6_protocol = { +static struct inet6_protocol tcpv6_protocol = { .early_demux = tcp_v6_early_demux, .early_demux_handler = tcp_v6_early_demux, .handler = tcp_v6_rcv, |