IB/hfi1: Use struct_size() helper

[linux-2.6-block.git] / drivers / infiniband / hw / hfi1 / mad.c

diff --git a/drivers/infiniband/hw/hfi1/mad.c b/drivers/infiniband/hw/hfi1/mad.c
index 4228393e6c4cc30ee4e2f08a1d1198f55b010163..184dba3c28284b13ea3b232d2a37f909851654a4 100644 (file)
--- a/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@ -2744,8 +2744,7 @@ static int pma_get_opa_portstatus(struct opa_pma_mad *pmp,
        u16 link_width;
        u16 link_speed;
 
-       response_data_size = sizeof(struct opa_port_status_rsp) +
-                               num_vls * sizeof(struct _vls_pctrs);
+       response_data_size = struct_size(rsp, vls, num_vls);
        if (response_data_size > sizeof(pmp->data)) {
                pmp->mad_hdr.status |= OPA_PM_STATUS_REQUEST_TOO_LARGE;
                return reply((struct ib_mad_hdr *)pmp);
@@ -3014,8 +3013,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp,
        }
 
        /* Sanity check */
-       response_data_size = sizeof(struct opa_port_data_counters_msg) +
-                               num_vls * sizeof(struct _vls_dctrs);
+       response_data_size = struct_size(req, port[0].vls, num_vls);
 
        if (response_data_size > sizeof(pmp->data)) {
                pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
@@ -3232,8 +3230,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp,
                return reply((struct ib_mad_hdr *)pmp);
        }
 
-       response_data_size = sizeof(struct opa_port_error_counters64_msg) +
-                               num_vls * sizeof(struct _vls_ectrs);
+       response_data_size = struct_size(req, port[0].vls, num_vls);
 
        if (response_data_size > sizeof(pmp->data)) {
                pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;