diff options
| -rw-r--r-- | include/net/ipv6.h | 1 | ||||
| -rw-r--r-- | net/ipv4/af_inet.c | 2 | ||||
| -rw-r--r-- | net/ipv6/ping.c | 2 | ||||
| -rw-r--r-- | net/ipv6/raw.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index dbf0abba33b8..3e505bbff8ca 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
| @@ -1007,6 +1007,7 @@ int inet6_hash_connect(struct inet_timewait_death_row *death_row, | |||
| 1007 | */ | 1007 | */ |
| 1008 | extern const struct proto_ops inet6_stream_ops; | 1008 | extern const struct proto_ops inet6_stream_ops; |
| 1009 | extern const struct proto_ops inet6_dgram_ops; | 1009 | extern const struct proto_ops inet6_dgram_ops; |
| 1010 | extern const struct proto_ops inet6_sockraw_ops; | ||
| 1010 | 1011 | ||
| 1011 | struct group_source_req; | 1012 | struct group_source_req; |
| 1012 | struct group_filter; | 1013 | struct group_filter; |
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index f3dad1661343..58925b6597de 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -1043,7 +1043,7 @@ static struct inet_protosw inetsw_array[] = | |||
| 1043 | .type = SOCK_DGRAM, | 1043 | .type = SOCK_DGRAM, |
| 1044 | .protocol = IPPROTO_ICMP, | 1044 | .protocol = IPPROTO_ICMP, |
| 1045 | .prot = &ping_prot, | 1045 | .prot = &ping_prot, |
| 1046 | .ops = &inet_dgram_ops, | 1046 | .ops = &inet_sockraw_ops, |
| 1047 | .flags = INET_PROTOSW_REUSE, | 1047 | .flags = INET_PROTOSW_REUSE, |
| 1048 | }, | 1048 | }, |
| 1049 | 1049 | ||
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c index 9b522fa90e6d..ac826dd338ff 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c | |||
| @@ -192,7 +192,7 @@ static struct inet_protosw pingv6_protosw = { | |||
| 192 | .type = SOCK_DGRAM, | 192 | .type = SOCK_DGRAM, |
| 193 | .protocol = IPPROTO_ICMPV6, | 193 | .protocol = IPPROTO_ICMPV6, |
| 194 | .prot = &pingv6_prot, | 194 | .prot = &pingv6_prot, |
| 195 | .ops = &inet6_dgram_ops, | 195 | .ops = &inet6_sockraw_ops, |
| 196 | .flags = INET_PROTOSW_REUSE, | 196 | .flags = INET_PROTOSW_REUSE, |
| 197 | }; | 197 | }; |
| 198 | 198 | ||
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 1f992d9e261d..60be012fe708 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
| @@ -1338,7 +1338,7 @@ void raw6_proc_exit(void) | |||
| 1338 | #endif /* CONFIG_PROC_FS */ | 1338 | #endif /* CONFIG_PROC_FS */ |
| 1339 | 1339 | ||
| 1340 | /* Same as inet6_dgram_ops, sans udp_poll. */ | 1340 | /* Same as inet6_dgram_ops, sans udp_poll. */ |
| 1341 | static const struct proto_ops inet6_sockraw_ops = { | 1341 | const struct proto_ops inet6_sockraw_ops = { |
| 1342 | .family = PF_INET6, | 1342 | .family = PF_INET6, |
| 1343 | .owner = THIS_MODULE, | 1343 | .owner = THIS_MODULE, |
| 1344 | .release = inet6_release, | 1344 | .release = inet6_release, |
