diff options
author | Doug Ledford <dledford@redhat.com> | 2017-07-27 09:00:38 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2017-07-27 09:00:38 -0400 |
commit | a5f66725c7748a6831005a091b4aa9d18abb3b03 (patch) | |
tree | b282b84f1c106bf00e8112979721567a91dfb86a /drivers/infiniband/hw/qib/qib_mad.c | |
parent | Merge branches 'rxe' and 'mlx' into k.o/for-next (diff) | |
parent | RDMA/qedr: notify user application of supported WIDs (diff) | |
download | linux-dev-a5f66725c7748a6831005a091b4aa9d18abb3b03.tar.xz linux-dev-a5f66725c7748a6831005a091b4aa9d18abb3b03.zip |
Merge branch 'misc' into k.o/for-next
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_mad.c')
-rw-r--r-- | drivers/infiniband/hw/qib/qib_mad.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c index a4a7f2a76f24..6b9b43b944e3 100644 --- a/drivers/infiniband/hw/qib/qib_mad.c +++ b/drivers/infiniband/hw/qib/qib_mad.c @@ -871,8 +871,6 @@ static int subn_set_portinfo(struct ib_smp *smp, struct ib_device *ibdev, ib_dispatch_event(&event); } - ret = subn_get_portinfo(smp, ibdev, port); - /* restore re-reg bit per o14-12.2.1 */ pip->clientrereg_resv_subnetto |= clientrereg; |