diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/infiniband/hw/mthca/mthca_mad.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_mad.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_mad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c index d9bc030bcccc..45e106f14807 100644 --- a/drivers/infiniband/hw/mthca/mthca_mad.c +++ b/drivers/infiniband/hw/mthca/mthca_mad.c | |||
| @@ -119,7 +119,7 @@ static void smp_snoop(struct ib_device *ibdev, | |||
| 119 | 119 | ||
| 120 | mthca_update_rate(to_mdev(ibdev), port_num); | 120 | mthca_update_rate(to_mdev(ibdev), port_num); |
| 121 | update_sm_ah(to_mdev(ibdev), port_num, | 121 | update_sm_ah(to_mdev(ibdev), port_num, |
| 122 | be16_to_cpu(pinfo->lid), | 122 | be16_to_cpu(pinfo->sm_lid), |
| 123 | pinfo->neighbormtu_mastersmsl & 0xf); | 123 | pinfo->neighbormtu_mastersmsl & 0xf); |
| 124 | 124 | ||
| 125 | event.device = ibdev; | 125 | event.device = ibdev; |