Add SIOCRDSGETTOS to get the current TOS for the socket

Orabug: 16397197
Signed-off-by: Bang Nguyen <bang.nguyen@oracle.com>
(cherry picked from commit 201e2362694aab25b4ef6b11e5bd62b75b2a0e17)

diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index ec0a19475a3b9cc57fe8acaeddd7c1e3b1abe746..1caffb379c3eb653a6951e36f3e3e478d5d55845 100644 (file)
--- a/include/uapi/linux/rds.h
+++ b/include/uapi/linux/rds.h
@@ -63,6 +63,7 @@
  * ioctl commands for SOL_RDS
 */
 #define SIOCRDSSETTOS                   (SIOCPROTOPRIVATE)
+#define SIOCRDSGETTOS                  (SIOCPROTOPRIVATE + 1)
 
 typedef u_int8_t         rds_tos_t;
 

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index 48406609889c212f7111ec53fa0dcdc35232b71a..5869a0434fe1d61127baecc88e3f052d0cac36ea 100644 (file)
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -227,6 +227,13 @@ static int rds_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                rs->rs_tos = tos;
                spin_unlock_bh(&rds_sock_lock);
                break;
+        case SIOCRDSGETTOS:
+                spin_lock_bh(&rds_sock_lock);
+                tos = rs->rs_tos;
+                spin_unlock_bh(&rds_sock_lock);
+                if (put_user(tos, (rds_tos_t __user *)arg))
+                        return -EFAULT;
+                break;
        default:
                return -ENOIOCTLCMD;
        }