diff options
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/proto.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 59b214995f28..6d7aef9647de 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -522,14 +522,10 @@ EXPORT_SYMBOL_GPL(dccp_setsockopt); | |||
522 | int compat_dccp_setsockopt(struct sock *sk, int level, int optname, | 522 | int compat_dccp_setsockopt(struct sock *sk, int level, int optname, |
523 | char __user *optval, int optlen) | 523 | char __user *optval, int optlen) |
524 | { | 524 | { |
525 | if (level != SOL_DCCP) { | 525 | if (level != SOL_DCCP) |
526 | if (inet_csk(sk)->icsk_af_ops->compat_setsockopt) | 526 | return inet_csk_compat_setsockopt(sk, level, optname, |
527 | return inet_csk(sk)->icsk_af_ops->compat_setsockopt(sk, | 527 | optval, optlen); |
528 | level, optname, optval, optlen); | 528 | |
529 | else | ||
530 | return inet_csk(sk)->icsk_af_ops->setsockopt(sk, | ||
531 | level, optname, optval, optlen); | ||
532 | } | ||
533 | return do_dccp_setsockopt(sk, level, optname, optval, optlen); | 529 | return do_dccp_setsockopt(sk, level, optname, optval, optlen); |
534 | } | 530 | } |
535 | EXPORT_SYMBOL_GPL(compat_dccp_setsockopt); | 531 | EXPORT_SYMBOL_GPL(compat_dccp_setsockopt); |
@@ -619,14 +615,9 @@ EXPORT_SYMBOL_GPL(dccp_getsockopt); | |||
619 | int compat_dccp_getsockopt(struct sock *sk, int level, int optname, | 615 | int compat_dccp_getsockopt(struct sock *sk, int level, int optname, |
620 | char __user *optval, int __user *optlen) | 616 | char __user *optval, int __user *optlen) |
621 | { | 617 | { |
622 | if (level != SOL_DCCP) { | 618 | if (level != SOL_DCCP) |
623 | if (inet_csk(sk)->icsk_af_ops->compat_setsockopt) | 619 | return inet_csk_compat_getsockopt(sk, level, optname, |
624 | return inet_csk(sk)->icsk_af_ops->compat_getsockopt(sk, | 620 | optval, optlen); |
625 | level, optname, optval, optlen); | ||
626 | else | ||
627 | return inet_csk(sk)->icsk_af_ops->getsockopt(sk, | ||
628 | level, optname, optval, optlen); | ||
629 | } | ||
630 | return do_dccp_getsockopt(sk, level, optname, optval, optlen); | 621 | return do_dccp_getsockopt(sk, level, optname, optval, optlen); |
631 | } | 622 | } |
632 | EXPORT_SYMBOL_GPL(compat_dccp_getsockopt); | 623 | EXPORT_SYMBOL_GPL(compat_dccp_getsockopt); |