Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / infiniband / hw / qib / qib_mad.c

diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c
index 8fd3df5..3b3745f 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_mad.c
+++ b/drivers/infiniband/hw/qib/qib_mad.c
@@ -1125,22 +1125,22 @@ static int subn_trap_repress(struct ib_smp *smp, struct ib_device *ibdev,
        return IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED;
 }
 
-static int pma_get_classportinfo(struct ib_perf *pmp,
+static int pma_get_classportinfo(struct ib_pma_mad *pmp,
                                 struct ib_device *ibdev)
 {
-       struct ib_pma_classportinfo *p =
-               (struct ib_pma_classportinfo *)pmp->data;
+       struct ib_class_port_info *p =
+               (struct ib_class_port_info *)pmp->data;
        struct qib_devdata *dd = dd_from_ibdev(ibdev);
 
        memset(pmp->data, 0, sizeof(pmp->data));
 
-       if (pmp->attr_mod != 0)
-               pmp->status |= IB_SMP_INVALID_FIELD;
+       if (pmp->mad_hdr.attr_mod != 0)
+               pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
 
        /* Note that AllPortSelect is not valid */
        p->base_version = 1;
        p->class_version = 1;
-       p->cap_mask = IB_PMA_CLASS_CAP_EXT_WIDTH;
+       p->capability_mask = IB_PMA_CLASS_CAP_EXT_WIDTH;
        /*
         * Set the most significant bit of CM2 to indicate support for
         * congestion statistics
@@ -1154,7 +1154,7 @@ static int pma_get_classportinfo(struct ib_perf *pmp,
        return reply((struct ib_smp *) pmp);
 }
 
-static int pma_get_portsamplescontrol(struct ib_perf *pmp,
+static int pma_get_portsamplescontrol(struct ib_pma_mad *pmp,
                                      struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portsamplescontrol *p =
@@ -1169,8 +1169,8 @@ static int pma_get_portsamplescontrol(struct ib_perf *pmp,
        memset(pmp->data, 0, sizeof(pmp->data));
 
        p->port_select = port_select;
-       if (pmp->attr_mod != 0 || port_select != port) {
-               pmp->status |= IB_SMP_INVALID_FIELD;
+       if (pmp->mad_hdr.attr_mod != 0 || port_select != port) {
+               pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
                goto bail;
        }
        spin_lock_irqsave(&ibp->lock, flags);
@@ -1192,7 +1192,7 @@ bail:
        return reply((struct ib_smp *) pmp);
 }
 
-static int pma_set_portsamplescontrol(struct ib_perf *pmp,
+static int pma_set_portsamplescontrol(struct ib_pma_mad *pmp,
                                      struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portsamplescontrol *p =
@@ -1205,8 +1205,8 @@ static int pma_set_portsamplescontrol(struct ib_perf *pmp,
        u8 status, xmit_flags;
        int ret;
 
-       if (pmp->attr_mod != 0 || p->port_select != port) {
-               pmp->status |= IB_SMP_INVALID_FIELD;
+       if (pmp->mad_hdr.attr_mod != 0 || p->port_select != port) {
+               pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
                ret = reply((struct ib_smp *) pmp);
                goto bail;
        }
@@ -1321,7 +1321,7 @@ static u64 get_cache_hw_sample_counters(struct qib_pportdata *ppd,
        return ret;
 }
 
-static int pma_get_portsamplesresult(struct ib_perf *pmp,
+static int pma_get_portsamplesresult(struct ib_pma_mad *pmp,
                                     struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portsamplesresult *p =
@@ -1360,7 +1360,7 @@ static int pma_get_portsamplesresult(struct ib_perf *pmp,
        return reply((struct ib_smp *) pmp);
 }
 
-static int pma_get_portsamplesresult_ext(struct ib_perf *pmp,
+static int pma_get_portsamplesresult_ext(struct ib_pma_mad *pmp,
                                         struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portsamplesresult_ext *p =
@@ -1402,7 +1402,7 @@ static int pma_get_portsamplesresult_ext(struct ib_perf *pmp,
        return reply((struct ib_smp *) pmp);
 }
 
-static int pma_get_portcounters(struct ib_perf *pmp,
+static int pma_get_portcounters(struct ib_pma_mad *pmp,
                                struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portcounters *p = (struct ib_pma_portcounters *)
@@ -1436,8 +1436,8 @@ static int pma_get_portcounters(struct ib_perf *pmp,
        memset(pmp->data, 0, sizeof(pmp->data));
 
        p->port_select = port_select;
-       if (pmp->attr_mod != 0 || port_select != port)
-               pmp->status |= IB_SMP_INVALID_FIELD;
+       if (pmp->mad_hdr.attr_mod != 0 || port_select != port)
+               pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
 
        if (cntrs.symbol_error_counter > 0xFFFFUL)
                p->symbol_error_counter = cpu_to_be16(0xFFFF);
@@ -1472,7 +1472,7 @@ static int pma_get_portcounters(struct ib_perf *pmp,
                cntrs.local_link_integrity_errors = 0xFUL;
        if (cntrs.excessive_buffer_overrun_errors > 0xFUL)
                cntrs.excessive_buffer_overrun_errors = 0xFUL;
-       p->lli_ebor_errors = (cntrs.local_link_integrity_errors << 4) |
+       p->link_overrun_errors = (cntrs.local_link_integrity_errors << 4) |
                cntrs.excessive_buffer_overrun_errors;
        if (cntrs.vl15_dropped > 0xFFFFUL)
                p->vl15_dropped = cpu_to_be16(0xFFFF);
@@ -1500,7 +1500,7 @@ static int pma_get_portcounters(struct ib_perf *pmp,
        return reply((struct ib_smp *) pmp);
 }
 
-static int pma_get_portcounters_cong(struct ib_perf *pmp,
+static int pma_get_portcounters_cong(struct ib_pma_mad *pmp,
                                     struct ib_device *ibdev, u8 port)
 {
        /* Congestion PMA packets start at offset 24 not 64 */
@@ -1510,7 +1510,7 @@ static int pma_get_portcounters_cong(struct ib_perf *pmp,
        struct qib_ibport *ibp = to_iport(ibdev, port);
        struct qib_pportdata *ppd = ppd_from_ibp(ibp);
        struct qib_devdata *dd = dd_from_ppd(ppd);
-       u32 port_select = be32_to_cpu(pmp->attr_mod) & 0xFF;
+       u32 port_select = be32_to_cpu(pmp->mad_hdr.attr_mod) & 0xFF;
        u64 xmit_wait_counter;
        unsigned long flags;
 
@@ -1519,9 +1519,9 @@ static int pma_get_portcounters_cong(struct ib_perf *pmp,
         * SET method ends up calling this anyway.
         */
        if (!dd->psxmitwait_supported)
-               pmp->status |= IB_SMP_UNSUP_METH_ATTR;
+               pmp->mad_hdr.status |= IB_SMP_UNSUP_METH_ATTR;
        if (port_select != port)
-               pmp->status |= IB_SMP_INVALID_FIELD;
+               pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
 
        qib_get_counters(ppd, &cntrs);
        spin_lock_irqsave(&ppd->ibport_data.lock, flags);
@@ -1603,7 +1603,7 @@ static int pma_get_portcounters_cong(struct ib_perf *pmp,
                cntrs.local_link_integrity_errors = 0xFUL;
        if (cntrs.excessive_buffer_overrun_errors > 0xFUL)
                cntrs.excessive_buffer_overrun_errors = 0xFUL;
-       p->lli_ebor_errors = (cntrs.local_link_integrity_errors << 4) |
+       p->link_overrun_errors = (cntrs.local_link_integrity_errors << 4) |
                cntrs.excessive_buffer_overrun_errors;
        if (cntrs.vl15_dropped > 0xFFFFUL)
                p->vl15_dropped = cpu_to_be16(0xFFFF);
@@ -1613,7 +1613,7 @@ static int pma_get_portcounters_cong(struct ib_perf *pmp,
        return reply((struct ib_smp *)pmp);
 }
 
-static int pma_get_portcounters_ext(struct ib_perf *pmp,
+static int pma_get_portcounters_ext(struct ib_pma_mad *pmp,
                                    struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portcounters_ext *p =
@@ -1626,8 +1626,8 @@ static int pma_get_portcounters_ext(struct ib_perf *pmp,
        memset(pmp->data, 0, sizeof(pmp->data));
 
        p->port_select = port_select;
-       if (pmp->attr_mod != 0 || port_select != port) {
-               pmp->status |= IB_SMP_INVALID_FIELD;
+       if (pmp->mad_hdr.attr_mod != 0 || port_select != port) {
+               pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD;
                goto bail;
        }
 
@@ -1652,7 +1652,7 @@ bail:
        return reply((struct ib_smp *) pmp);
 }
 
-static int pma_set_portcounters(struct ib_perf *pmp,
+static int pma_set_portcounters(struct ib_pma_mad *pmp,
                                struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portcounters *p = (struct ib_pma_portcounters *)
@@ -1715,14 +1715,14 @@ static int pma_set_portcounters(struct ib_perf *pmp,
        return pma_get_portcounters(pmp, ibdev, port);
 }
 
-static int pma_set_portcounters_cong(struct ib_perf *pmp,
+static int pma_set_portcounters_cong(struct ib_pma_mad *pmp,
                                     struct ib_device *ibdev, u8 port)
 {
        struct qib_ibport *ibp = to_iport(ibdev, port);
        struct qib_pportdata *ppd = ppd_from_ibp(ibp);
        struct qib_devdata *dd = dd_from_ppd(ppd);
        struct qib_verbs_counters cntrs;
-       u32 counter_select = (be32_to_cpu(pmp->attr_mod) >> 24) & 0xFF;
+       u32 counter_select = (be32_to_cpu(pmp->mad_hdr.attr_mod) >> 24) & 0xFF;
        int ret = 0;
        unsigned long flags;
 
@@ -1766,7 +1766,7 @@ static int pma_set_portcounters_cong(struct ib_perf *pmp,
        return ret;
 }
 
-static int pma_set_portcounters_ext(struct ib_perf *pmp,
+static int pma_set_portcounters_ext(struct ib_pma_mad *pmp,
                                    struct ib_device *ibdev, u8 port)
 {
        struct ib_pma_portcounters *p = (struct ib_pma_portcounters *)
@@ -1959,19 +1959,19 @@ static int process_perf(struct ib_device *ibdev, u8 port,
                        struct ib_mad *in_mad,
                        struct ib_mad *out_mad)
 {
-       struct ib_perf *pmp = (struct ib_perf *)out_mad;
+       struct ib_pma_mad *pmp = (struct ib_pma_mad *)out_mad;
        int ret;
 
        *out_mad = *in_mad;
-       if (pmp->class_version != 1) {
-               pmp->status |= IB_SMP_UNSUP_VERSION;
+       if (pmp->mad_hdr.class_version != 1) {
+               pmp->mad_hdr.status |= IB_SMP_UNSUP_VERSION;
                ret = reply((struct ib_smp *) pmp);
                goto bail;
        }
 
-       switch (pmp->method) {
+       switch (pmp->mad_hdr.method) {
        case IB_MGMT_METHOD_GET:
-               switch (pmp->attr_id) {
+               switch (pmp->mad_hdr.attr_id) {
                case IB_PMA_CLASS_PORT_INFO:
                        ret = pma_get_classportinfo(pmp, ibdev);
                        goto bail;
@@ -1994,13 +1994,13 @@ static int process_perf(struct ib_device *ibdev, u8 port,
                        ret = pma_get_portcounters_cong(pmp, ibdev, port);
                        goto bail;
                default:
-                       pmp->status |= IB_SMP_UNSUP_METH_ATTR;
+                       pmp->mad_hdr.status |= IB_SMP_UNSUP_METH_ATTR;
                        ret = reply((struct ib_smp *) pmp);
                        goto bail;
                }
 
        case IB_MGMT_METHOD_SET:
-               switch (pmp->attr_id) {
+               switch (pmp->mad_hdr.attr_id) {
                case IB_PMA_PORT_SAMPLES_CONTROL:
                        ret = pma_set_portsamplescontrol(pmp, ibdev, port);
                        goto bail;
@@ -2014,7 +2014,7 @@ static int process_perf(struct ib_device *ibdev, u8 port,
                        ret = pma_set_portcounters_cong(pmp, ibdev, port);
                        goto bail;
                default:
-                       pmp->status |= IB_SMP_UNSUP_METH_ATTR;
+                       pmp->mad_hdr.status |= IB_SMP_UNSUP_METH_ATTR;
                        ret = reply((struct ib_smp *) pmp);
                        goto bail;
                }
@@ -2030,7 +2030,7 @@ static int process_perf(struct ib_device *ibdev, u8 port,
                goto bail;
 
        default:
-               pmp->status |= IB_SMP_UNSUP_METHOD;
+               pmp->mad_hdr.status |= IB_SMP_UNSUP_METHOD;
                ret = reply((struct ib_smp *) pmp);
        }