diff options
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 538ada00646a..8d3432a70f3a 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -934,11 +934,11 @@ static int udpv6_setsockopt(struct sock *sk, int level, int optname, | |||
934 | 934 | ||
935 | #ifdef CONFIG_COMPAT | 935 | #ifdef CONFIG_COMPAT |
936 | static int compat_udpv6_setsockopt(struct sock *sk, int level, int optname, | 936 | static int compat_udpv6_setsockopt(struct sock *sk, int level, int optname, |
937 | char __user *optval, int optlen) | 937 | char __user *optval, int optlen) |
938 | { | 938 | { |
939 | if (level != SOL_UDP) | 939 | if (level != SOL_UDP) |
940 | return compat_ipv6_setsockopt(sk, level, | 940 | return compat_ipv6_setsockopt(sk, level, optname, |
941 | optname, optval, optlen); | 941 | optval, optlen); |
942 | return do_udpv6_setsockopt(sk, level, optname, optval, optlen); | 942 | return do_udpv6_setsockopt(sk, level, optname, optval, optlen); |
943 | } | 943 | } |
944 | #endif | 944 | #endif |
@@ -987,11 +987,11 @@ static int udpv6_getsockopt(struct sock *sk, int level, int optname, | |||
987 | 987 | ||
988 | #ifdef CONFIG_COMPAT | 988 | #ifdef CONFIG_COMPAT |
989 | static int compat_udpv6_getsockopt(struct sock *sk, int level, int optname, | 989 | static int compat_udpv6_getsockopt(struct sock *sk, int level, int optname, |
990 | char __user *optval, int __user *optlen) | 990 | char __user *optval, int __user *optlen) |
991 | { | 991 | { |
992 | if (level != SOL_UDP) | 992 | if (level != SOL_UDP) |
993 | return compat_ipv6_getsockopt(sk, level, | 993 | return compat_ipv6_getsockopt(sk, level, optname, |
994 | optname, optval, optlen); | 994 | optval, optlen); |
995 | return do_udpv6_getsockopt(sk, level, optname, optval, optlen); | 995 | return do_udpv6_getsockopt(sk, level, optname, optval, optlen); |
996 | } | 996 | } |
997 | #endif | 997 | #endif |
@@ -1069,26 +1069,26 @@ void udp6_proc_exit(void) { | |||
1069 | /* ------------------------------------------------------------------------ */ | 1069 | /* ------------------------------------------------------------------------ */ |
1070 | 1070 | ||
1071 | struct proto udpv6_prot = { | 1071 | struct proto udpv6_prot = { |
1072 | .name = "UDPv6", | 1072 | .name = "UDPv6", |
1073 | .owner = THIS_MODULE, | 1073 | .owner = THIS_MODULE, |
1074 | .close = udpv6_close, | 1074 | .close = udpv6_close, |
1075 | .connect = ip6_datagram_connect, | 1075 | .connect = ip6_datagram_connect, |
1076 | .disconnect = udp_disconnect, | 1076 | .disconnect = udp_disconnect, |
1077 | .ioctl = udp_ioctl, | 1077 | .ioctl = udp_ioctl, |
1078 | .destroy = udpv6_destroy_sock, | 1078 | .destroy = udpv6_destroy_sock, |
1079 | .setsockopt = udpv6_setsockopt, | 1079 | .setsockopt = udpv6_setsockopt, |
1080 | .getsockopt = udpv6_getsockopt, | 1080 | .getsockopt = udpv6_getsockopt, |
1081 | .sendmsg = udpv6_sendmsg, | ||
1082 | .recvmsg = udpv6_recvmsg, | ||
1083 | .backlog_rcv = udpv6_queue_rcv_skb, | ||
1084 | .hash = udp_v6_hash, | ||
1085 | .unhash = udp_v6_unhash, | ||
1086 | .get_port = udp_v6_get_port, | ||
1087 | .obj_size = sizeof(struct udp6_sock), | ||
1081 | #ifdef CONFIG_COMPAT | 1088 | #ifdef CONFIG_COMPAT |
1082 | .compat_setsockopt = compat_udpv6_setsockopt, | 1089 | .compat_setsockopt = compat_udpv6_setsockopt, |
1083 | .compat_getsockopt = compat_udpv6_getsockopt, | 1090 | .compat_getsockopt = compat_udpv6_getsockopt, |
1084 | #endif | 1091 | #endif |
1085 | .sendmsg = udpv6_sendmsg, | ||
1086 | .recvmsg = udpv6_recvmsg, | ||
1087 | .backlog_rcv = udpv6_queue_rcv_skb, | ||
1088 | .hash = udp_v6_hash, | ||
1089 | .unhash = udp_v6_unhash, | ||
1090 | .get_port = udp_v6_get_port, | ||
1091 | .obj_size = sizeof(struct udp6_sock), | ||
1092 | }; | 1092 | }; |
1093 | 1093 | ||
1094 | static struct inet_protosw udpv6_protosw = { | 1094 | static struct inet_protosw udpv6_protosw = { |