diff options
Diffstat (limited to 'net/ipv4/raw.c')
-rw-r--r-- | net/ipv4/raw.c | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index f1b02b34fc0a..fc2562415555 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c | |||
@@ -682,11 +682,10 @@ static int raw_setsockopt(struct sock *sk, int level, int optname, | |||
682 | 682 | ||
683 | #ifdef CONFIG_COMPAT | 683 | #ifdef CONFIG_COMPAT |
684 | static int compat_raw_setsockopt(struct sock *sk, int level, int optname, | 684 | static int compat_raw_setsockopt(struct sock *sk, int level, int optname, |
685 | char __user *optval, int optlen) | 685 | char __user *optval, int optlen) |
686 | { | 686 | { |
687 | if (level != SOL_RAW) | 687 | if (level != SOL_RAW) |
688 | return compat_ip_setsockopt(sk, level, | 688 | return compat_ip_setsockopt(sk, level, optname, optval, optlen); |
689 | optname, optval, optlen); | ||
690 | return do_raw_setsockopt(sk, level, optname, optval, optlen); | 689 | return do_raw_setsockopt(sk, level, optname, optval, optlen); |
691 | } | 690 | } |
692 | #endif | 691 | #endif |
@@ -713,11 +712,10 @@ static int raw_getsockopt(struct sock *sk, int level, int optname, | |||
713 | 712 | ||
714 | #ifdef CONFIG_COMPAT | 713 | #ifdef CONFIG_COMPAT |
715 | static int compat_raw_getsockopt(struct sock *sk, int level, int optname, | 714 | static int compat_raw_getsockopt(struct sock *sk, int level, int optname, |
716 | char __user *optval, int __user *optlen) | 715 | char __user *optval, int __user *optlen) |
717 | { | 716 | { |
718 | if (level != SOL_RAW) | 717 | if (level != SOL_RAW) |
719 | return compat_ip_getsockopt(sk, level, | 718 | return compat_ip_getsockopt(sk, level, optname, optval, optlen); |
720 | optname, optval, optlen); | ||
721 | return do_raw_getsockopt(sk, level, optname, optval, optlen); | 719 | return do_raw_getsockopt(sk, level, optname, optval, optlen); |
722 | } | 720 | } |
723 | #endif | 721 | #endif |
@@ -751,26 +749,26 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg) | |||
751 | } | 749 | } |
752 | 750 | ||
753 | struct proto raw_prot = { | 751 | struct proto raw_prot = { |
754 | .name = "RAW", | 752 | .name = "RAW", |
755 | .owner = THIS_MODULE, | 753 | .owner = THIS_MODULE, |
756 | .close = raw_close, | 754 | .close = raw_close, |
757 | .connect = ip4_datagram_connect, | 755 | .connect = ip4_datagram_connect, |
758 | .disconnect = udp_disconnect, | 756 | .disconnect = udp_disconnect, |
759 | .ioctl = raw_ioctl, | 757 | .ioctl = raw_ioctl, |
760 | .init = raw_init, | 758 | .init = raw_init, |
761 | .setsockopt = raw_setsockopt, | 759 | .setsockopt = raw_setsockopt, |
762 | .getsockopt = raw_getsockopt, | 760 | .getsockopt = raw_getsockopt, |
761 | .sendmsg = raw_sendmsg, | ||
762 | .recvmsg = raw_recvmsg, | ||
763 | .bind = raw_bind, | ||
764 | .backlog_rcv = raw_rcv_skb, | ||
765 | .hash = raw_v4_hash, | ||
766 | .unhash = raw_v4_unhash, | ||
767 | .obj_size = sizeof(struct raw_sock), | ||
763 | #ifdef CONFIG_COMPAT | 768 | #ifdef CONFIG_COMPAT |
764 | .compat_setsockopt = compat_raw_setsockopt, | 769 | .compat_setsockopt = compat_raw_setsockopt, |
765 | .compat_getsockopt = compat_raw_getsockopt, | 770 | .compat_getsockopt = compat_raw_getsockopt, |
766 | #endif | 771 | #endif |
767 | .sendmsg = raw_sendmsg, | ||
768 | .recvmsg = raw_recvmsg, | ||
769 | .bind = raw_bind, | ||
770 | .backlog_rcv = raw_rcv_skb, | ||
771 | .hash = raw_v4_hash, | ||
772 | .unhash = raw_v4_unhash, | ||
773 | .obj_size = sizeof(struct raw_sock), | ||
774 | }; | 772 | }; |
775 | 773 | ||
776 | #ifdef CONFIG_PROC_FS | 774 | #ifdef CONFIG_PROC_FS |