diff options
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/ipv6.c | 92 | ||||
-rw-r--r-- | net/sctp/protocol.c | 94 |
2 files changed, 93 insertions, 93 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index bbee14d01c9b..c20d282fac06 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -861,27 +861,27 @@ static int sctp_inet6_supported_addrs(const struct sctp_sock *opt, | |||
861 | } | 861 | } |
862 | 862 | ||
863 | static const struct proto_ops inet6_seqpacket_ops = { | 863 | static const struct proto_ops inet6_seqpacket_ops = { |
864 | .family = PF_INET6, | 864 | .family = PF_INET6, |
865 | .owner = THIS_MODULE, | 865 | .owner = THIS_MODULE, |
866 | .release = inet6_release, | 866 | .release = inet6_release, |
867 | .bind = inet6_bind, | 867 | .bind = inet6_bind, |
868 | .connect = inet_dgram_connect, | 868 | .connect = inet_dgram_connect, |
869 | .socketpair = sock_no_socketpair, | 869 | .socketpair = sock_no_socketpair, |
870 | .accept = inet_accept, | 870 | .accept = inet_accept, |
871 | .getname = inet6_getname, | 871 | .getname = inet6_getname, |
872 | .poll = sctp_poll, | 872 | .poll = sctp_poll, |
873 | .ioctl = inet6_ioctl, | 873 | .ioctl = inet6_ioctl, |
874 | .listen = sctp_inet_listen, | 874 | .listen = sctp_inet_listen, |
875 | .shutdown = inet_shutdown, | 875 | .shutdown = inet_shutdown, |
876 | .setsockopt = sock_common_setsockopt, | 876 | .setsockopt = sock_common_setsockopt, |
877 | .getsockopt = sock_common_getsockopt, | 877 | .getsockopt = sock_common_getsockopt, |
878 | .sendmsg = inet_sendmsg, | ||
879 | .recvmsg = sock_common_recvmsg, | ||
880 | .mmap = sock_no_mmap, | ||
878 | #ifdef CONFIG_COMPAT | 881 | #ifdef CONFIG_COMPAT |
879 | .compat_setsockopt = compat_sock_common_setsockopt, | 882 | .compat_setsockopt = compat_sock_common_setsockopt, |
880 | .compat_getsockopt = compat_sock_common_getsockopt, | 883 | .compat_getsockopt = compat_sock_common_getsockopt, |
881 | #endif | 884 | #endif |
882 | .sendmsg = inet_sendmsg, | ||
883 | .recvmsg = sock_common_recvmsg, | ||
884 | .mmap = sock_no_mmap, | ||
885 | }; | 885 | }; |
886 | 886 | ||
887 | static struct inet_protosw sctpv6_seqpacket_protosw = { | 887 | static struct inet_protosw sctpv6_seqpacket_protosw = { |
@@ -915,35 +915,35 @@ static struct inet6_protocol sctpv6_protocol = { | |||
915 | }; | 915 | }; |
916 | 916 | ||
917 | static struct sctp_af sctp_ipv6_specific = { | 917 | static struct sctp_af sctp_ipv6_specific = { |
918 | .sctp_xmit = sctp_v6_xmit, | 918 | .sa_family = AF_INET6, |
919 | .setsockopt = ipv6_setsockopt, | 919 | .sctp_xmit = sctp_v6_xmit, |
920 | .getsockopt = ipv6_getsockopt, | 920 | .setsockopt = ipv6_setsockopt, |
921 | .getsockopt = ipv6_getsockopt, | ||
922 | .get_dst = sctp_v6_get_dst, | ||
923 | .get_saddr = sctp_v6_get_saddr, | ||
924 | .copy_addrlist = sctp_v6_copy_addrlist, | ||
925 | .from_skb = sctp_v6_from_skb, | ||
926 | .from_sk = sctp_v6_from_sk, | ||
927 | .to_sk_saddr = sctp_v6_to_sk_saddr, | ||
928 | .to_sk_daddr = sctp_v6_to_sk_daddr, | ||
929 | .from_addr_param = sctp_v6_from_addr_param, | ||
930 | .to_addr_param = sctp_v6_to_addr_param, | ||
931 | .dst_saddr = sctp_v6_dst_saddr, | ||
932 | .cmp_addr = sctp_v6_cmp_addr, | ||
933 | .scope = sctp_v6_scope, | ||
934 | .addr_valid = sctp_v6_addr_valid, | ||
935 | .inaddr_any = sctp_v6_inaddr_any, | ||
936 | .is_any = sctp_v6_is_any, | ||
937 | .available = sctp_v6_available, | ||
938 | .skb_iif = sctp_v6_skb_iif, | ||
939 | .is_ce = sctp_v6_is_ce, | ||
940 | .seq_dump_addr = sctp_v6_seq_dump_addr, | ||
941 | .net_header_len = sizeof(struct ipv6hdr), | ||
942 | .sockaddr_len = sizeof(struct sockaddr_in6), | ||
921 | #ifdef CONFIG_COMPAT | 943 | #ifdef CONFIG_COMPAT |
922 | .compat_setsockopt = compat_ipv6_setsockopt, | 944 | .compat_setsockopt = compat_ipv6_setsockopt, |
923 | .compat_getsockopt = compat_ipv6_getsockopt, | 945 | .compat_getsockopt = compat_ipv6_getsockopt, |
924 | #endif | 946 | #endif |
925 | .get_dst = sctp_v6_get_dst, | ||
926 | .get_saddr = sctp_v6_get_saddr, | ||
927 | .copy_addrlist = sctp_v6_copy_addrlist, | ||
928 | .from_skb = sctp_v6_from_skb, | ||
929 | .from_sk = sctp_v6_from_sk, | ||
930 | .to_sk_saddr = sctp_v6_to_sk_saddr, | ||
931 | .to_sk_daddr = sctp_v6_to_sk_daddr, | ||
932 | .from_addr_param = sctp_v6_from_addr_param, | ||
933 | .to_addr_param = sctp_v6_to_addr_param, | ||
934 | .dst_saddr = sctp_v6_dst_saddr, | ||
935 | .cmp_addr = sctp_v6_cmp_addr, | ||
936 | .scope = sctp_v6_scope, | ||
937 | .addr_valid = sctp_v6_addr_valid, | ||
938 | .inaddr_any = sctp_v6_inaddr_any, | ||
939 | .is_any = sctp_v6_is_any, | ||
940 | .available = sctp_v6_available, | ||
941 | .skb_iif = sctp_v6_skb_iif, | ||
942 | .is_ce = sctp_v6_is_ce, | ||
943 | .seq_dump_addr = sctp_v6_seq_dump_addr, | ||
944 | .net_header_len = sizeof(struct ipv6hdr), | ||
945 | .sockaddr_len = sizeof(struct sockaddr_in6), | ||
946 | .sa_family = AF_INET6, | ||
947 | }; | 947 | }; |
948 | 948 | ||
949 | static struct sctp_pf sctp_pf_inet6_specific = { | 949 | static struct sctp_pf sctp_pf_inet6_specific = { |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index d90f5491870f..2088aa992b7a 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -831,28 +831,28 @@ static struct notifier_block sctp_inetaddr_notifier = { | |||
831 | 831 | ||
832 | /* Socket operations. */ | 832 | /* Socket operations. */ |
833 | static const struct proto_ops inet_seqpacket_ops = { | 833 | static const struct proto_ops inet_seqpacket_ops = { |
834 | .family = PF_INET, | 834 | .family = PF_INET, |
835 | .owner = THIS_MODULE, | 835 | .owner = THIS_MODULE, |
836 | .release = inet_release, /* Needs to be wrapped... */ | 836 | .release = inet_release, /* Needs to be wrapped... */ |
837 | .bind = inet_bind, | 837 | .bind = inet_bind, |
838 | .connect = inet_dgram_connect, | 838 | .connect = inet_dgram_connect, |
839 | .socketpair = sock_no_socketpair, | 839 | .socketpair = sock_no_socketpair, |
840 | .accept = inet_accept, | 840 | .accept = inet_accept, |
841 | .getname = inet_getname, /* Semantics are different. */ | 841 | .getname = inet_getname, /* Semantics are different. */ |
842 | .poll = sctp_poll, | 842 | .poll = sctp_poll, |
843 | .ioctl = inet_ioctl, | 843 | .ioctl = inet_ioctl, |
844 | .listen = sctp_inet_listen, | 844 | .listen = sctp_inet_listen, |
845 | .shutdown = inet_shutdown, /* Looks harmless. */ | 845 | .shutdown = inet_shutdown, /* Looks harmless. */ |
846 | .setsockopt = sock_common_setsockopt, /* IP_SOL IP_OPTION is a problem. */ | 846 | .setsockopt = sock_common_setsockopt, /* IP_SOL IP_OPTION is a problem */ |
847 | .getsockopt = sock_common_getsockopt, | 847 | .getsockopt = sock_common_getsockopt, |
848 | .sendmsg = inet_sendmsg, | ||
849 | .recvmsg = sock_common_recvmsg, | ||
850 | .mmap = sock_no_mmap, | ||
851 | .sendpage = sock_no_sendpage, | ||
848 | #ifdef CONFIG_COMPAT | 852 | #ifdef CONFIG_COMPAT |
849 | .compat_setsockopt = compat_sock_common_setsockopt, | 853 | .compat_setsockopt = compat_sock_common_setsockopt, |
850 | .compat_getsockopt = compat_sock_common_getsockopt, | 854 | .compat_getsockopt = compat_sock_common_getsockopt, |
851 | #endif | 855 | #endif |
852 | .sendmsg = inet_sendmsg, | ||
853 | .recvmsg = sock_common_recvmsg, | ||
854 | .mmap = sock_no_mmap, | ||
855 | .sendpage = sock_no_sendpage, | ||
856 | }; | 856 | }; |
857 | 857 | ||
858 | /* Registration with AF_INET family. */ | 858 | /* Registration with AF_INET family. */ |
@@ -884,35 +884,35 @@ static struct net_protocol sctp_protocol = { | |||
884 | 884 | ||
885 | /* IPv4 address related functions. */ | 885 | /* IPv4 address related functions. */ |
886 | static struct sctp_af sctp_ipv4_specific = { | 886 | static struct sctp_af sctp_ipv4_specific = { |
887 | .sctp_xmit = sctp_v4_xmit, | 887 | .sa_family = AF_INET, |
888 | .setsockopt = ip_setsockopt, | 888 | .sctp_xmit = sctp_v4_xmit, |
889 | .getsockopt = ip_getsockopt, | 889 | .setsockopt = ip_setsockopt, |
890 | .getsockopt = ip_getsockopt, | ||
891 | .get_dst = sctp_v4_get_dst, | ||
892 | .get_saddr = sctp_v4_get_saddr, | ||
893 | .copy_addrlist = sctp_v4_copy_addrlist, | ||
894 | .from_skb = sctp_v4_from_skb, | ||
895 | .from_sk = sctp_v4_from_sk, | ||
896 | .to_sk_saddr = sctp_v4_to_sk_saddr, | ||
897 | .to_sk_daddr = sctp_v4_to_sk_daddr, | ||
898 | .from_addr_param = sctp_v4_from_addr_param, | ||
899 | .to_addr_param = sctp_v4_to_addr_param, | ||
900 | .dst_saddr = sctp_v4_dst_saddr, | ||
901 | .cmp_addr = sctp_v4_cmp_addr, | ||
902 | .addr_valid = sctp_v4_addr_valid, | ||
903 | .inaddr_any = sctp_v4_inaddr_any, | ||
904 | .is_any = sctp_v4_is_any, | ||
905 | .available = sctp_v4_available, | ||
906 | .scope = sctp_v4_scope, | ||
907 | .skb_iif = sctp_v4_skb_iif, | ||
908 | .is_ce = sctp_v4_is_ce, | ||
909 | .seq_dump_addr = sctp_v4_seq_dump_addr, | ||
910 | .net_header_len = sizeof(struct iphdr), | ||
911 | .sockaddr_len = sizeof(struct sockaddr_in), | ||
890 | #ifdef CONFIG_COMPAT | 912 | #ifdef CONFIG_COMPAT |
891 | .compat_setsockopt = compat_ip_setsockopt, | 913 | .compat_setsockopt = compat_ip_setsockopt, |
892 | .compat_getsockopt = compat_ip_getsockopt, | 914 | .compat_getsockopt = compat_ip_getsockopt, |
893 | #endif | 915 | #endif |
894 | .get_dst = sctp_v4_get_dst, | ||
895 | .get_saddr = sctp_v4_get_saddr, | ||
896 | .copy_addrlist = sctp_v4_copy_addrlist, | ||
897 | .from_skb = sctp_v4_from_skb, | ||
898 | .from_sk = sctp_v4_from_sk, | ||
899 | .to_sk_saddr = sctp_v4_to_sk_saddr, | ||
900 | .to_sk_daddr = sctp_v4_to_sk_daddr, | ||
901 | .from_addr_param= sctp_v4_from_addr_param, | ||
902 | .to_addr_param = sctp_v4_to_addr_param, | ||
903 | .dst_saddr = sctp_v4_dst_saddr, | ||
904 | .cmp_addr = sctp_v4_cmp_addr, | ||
905 | .addr_valid = sctp_v4_addr_valid, | ||
906 | .inaddr_any = sctp_v4_inaddr_any, | ||
907 | .is_any = sctp_v4_is_any, | ||
908 | .available = sctp_v4_available, | ||
909 | .scope = sctp_v4_scope, | ||
910 | .skb_iif = sctp_v4_skb_iif, | ||
911 | .is_ce = sctp_v4_is_ce, | ||
912 | .seq_dump_addr = sctp_v4_seq_dump_addr, | ||
913 | .net_header_len = sizeof(struct iphdr), | ||
914 | .sockaddr_len = sizeof(struct sockaddr_in), | ||
915 | .sa_family = AF_INET, | ||
916 | }; | 916 | }; |
917 | 917 | ||
918 | struct sctp_pf *sctp_get_pf_specific(sa_family_t family) { | 918 | struct sctp_pf *sctp_get_pf_specific(sa_family_t family) { |