Commit bb1182bc authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f139ed9 e6eeb287
...@@ -1080,7 +1080,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev) ...@@ -1080,7 +1080,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
} }
static const struct inet6_protocol ip6gre_protocol = { static struct inet6_protocol ip6gre_protocol __read_mostly = {
.handler = gre_rcv, .handler = gre_rcv,
.err_handler = ip6gre_err, .err_handler = ip6gre_err,
.flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
......
...@@ -1944,7 +1944,7 @@ struct proto tcpv6_prot = { ...@@ -1944,7 +1944,7 @@ struct proto tcpv6_prot = {
.diag_destroy = tcp_abort, .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 = tcp_v6_early_demux,
.early_demux_handler = tcp_v6_early_demux, .early_demux_handler = tcp_v6_early_demux,
.handler = tcp_v6_rcv, .handler = tcp_v6_rcv,
......
...@@ -1448,7 +1448,7 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname, ...@@ -1448,7 +1448,7 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
} }
#endif #endif
static const struct inet6_protocol udpv6_protocol = { static struct inet6_protocol udpv6_protocol = {
.early_demux = udp_v6_early_demux, .early_demux = udp_v6_early_demux,
.early_demux_handler = udp_v6_early_demux, .early_demux_handler = udp_v6_early_demux,
.handler = udpv6_rcv, .handler = udpv6_rcv,
......
...@@ -788,7 +788,7 @@ static struct inet_protosw l2tp_ip6_protosw = { ...@@ -788,7 +788,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
.ops = &l2tp_ip6_ops, .ops = &l2tp_ip6_ops,
}; };
static const struct inet6_protocol l2tp_ip6_protocol = { static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
.handler = l2tp_ip6_recv, .handler = l2tp_ip6_recv,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment