[PATCH V2 net-next 3/7] sock: permit SO_ZEROCOPY on PF_RDS socket

[Sowmini Varadhan]

allow the application to set SO_ZEROCOPY on the underlying sk
of a PF_RDS socket

Signed-off-by: Sowmini Varadhan <sowmini.varad...@oracle.com>
---
 net/core/sock.c |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index 72d14b2..3c75adc 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1049,18 +1049,21 @@ int sock_setsockopt(struct socket *sock, int level, int 
optname,
                break;
 
        case SO_ZEROCOPY:
-               if (sk->sk_family != PF_INET && sk->sk_family != PF_INET6)
+               if (sk->sk_family == PF_INET || sk->sk_family == PF_INET6) {
+                       if (sk->sk_protocol != IPPROTO_TCP)
+                               ret = -ENOTSUPP;
+                       else if (sk->sk_state != TCP_CLOSE)
+                               ret = -EBUSY;
+               } else if (sk->sk_family != PF_RDS) {
                        ret = -ENOTSUPP;
-               else if (sk->sk_protocol != IPPROTO_TCP)
-                       ret = -ENOTSUPP;
-               else if (sk->sk_state != TCP_CLOSE)
-                       ret = -EBUSY;
-               else if (val < 0 || val > 1)
-                       ret = -EINVAL;
-               else
-                       sock_valbool_flag(sk, SOCK_ZEROCOPY, valbool);
-               break;
-
+               }
+               if (!ret) {
+                       if (val < 0 || val > 1)
+                               ret = -EINVAL;
+                       else
+                               sock_valbool_flag(sk, SOCK_ZEROCOPY, valbool);
+                       break;
+               }
        default:
                ret = -ENOPROTOOPT;
                break;
-- 
1.7.1