Changes to connect/TOS interface

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

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 75488c2129cf581dc8524fb776090550d5d486c4..43415423e76e05c7a022d0ccc99221d16ee97de7 100644 (file)
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -338,18 +338,6 @@ static int rds_ib_laddr_check(__be32 addr)
        return ret;
 }
 
-static u8 rds_ib_port_lookup(struct rds_ib_device *rds_ibdev, u8 port_num)
-{
-       u8      i;
-
-       for (i = 1; i <= ip_port_cnt; i++) {
-               if (ip_config[i].rds_ibdev == rds_ibdev &&
-                       ip_config[i].port_num == port_num)
-                       return i;
-       }
-       return 0;
-}
-
 static u8 rds_ib_get_failover_port(u8 port)
 {
        u8      i;

diff --git a/net/rds/ib.h b/net/rds/ib.h
index 5263b9ed4357a5253c27f3b26b56df57ecadec0a..c5737bd9a140a541a2e525757908faa807b8aa48 100644 (file)
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -83,7 +83,9 @@ struct rds_ib_connect_private {
        u8                      dp_protocol_major;
        u8                      dp_protocol_minor;
        __be16                  dp_protocol_minor_mask; /* bitmask */
-       __be32                  dp_tos;
+       u8                      dp_tos;
+       u8                      dp_reserved1;
+       __be16                  dp_reserved2;
        __be64                  dp_ack_seq;
        __be32                  dp_credit;              /* non-zero enables flow ctl */
 };

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index bce6a638cccf1acf42301959421dd2020dd2bb3e..8301c58f073fb340812ee8200ae664d42d2ad163 100644 (file)
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -266,7 +266,7 @@ static void rds_ib_cm_fill_conn_param(struct rds_connection *conn,
                dp->dp_protocol_minor = RDS_PROTOCOL_MINOR(protocol_version);
                dp->dp_protocol_minor_mask = cpu_to_be16(RDS_IB_SUPPORTED_PROTOCOLS);
                dp->dp_ack_seq = rds_ib_piggyb_ack(ic);
-               dp->dp_tos = cpu_to_be32(conn->c_tos);
+               dp->dp_tos = conn->c_tos;
 
                /* Advertise flow control */
                if (ic->i_flowctl) {
@@ -714,7 +714,7 @@ int rds_ib_cm_handle_connect(struct rdma_cm_id *cm_id,
                 (unsigned long long)be64_to_cpu(fguid));
 
        conn = rds_conn_create(dp->dp_daddr, dp->dp_saddr, &rds_ib_transport,
-                              be32_to_cpu(dp->dp_tos), GFP_KERNEL);
+                              dp->dp_tos, GFP_KERNEL);
        if (IS_ERR(conn)) {
                rdsdebug("rds_conn_create failed (%ld)\n", PTR_ERR(conn));
                conn = NULL;