diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
| commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
| tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /drivers/infiniband/hw/mthca/mthca_mcg.c | |
| parent | 54da9a3968448681d0ddf193ec90f2480c5cba1c (diff) | |
| parent | 2cc432eed0491df66e14b578139bba2c75fb3f9a (diff) | |
| download | talos-obmc-linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.tar.gz talos-obmc-linux-11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e.zip | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_mcg.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_mcg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c index 321f11e707f2..9965bda9afed 100644 --- a/drivers/infiniband/hw/mthca/mthca_mcg.c +++ b/drivers/infiniband/hw/mthca/mthca_mcg.c @@ -187,7 +187,7 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) for (i = 0; i < MTHCA_QP_PER_MGM; ++i) if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1 << 31))) { - mthca_dbg(dev, "QP %06x already a member of MGM\n", + mthca_dbg(dev, "QP %06x already a member of MGM\n", ibqp->qp_num); err = 0; goto out; |
