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 | |
| parent | f55c1e6608bed7f583f5be4a74bbca16b288a7e5 (diff) | |
| parent | 67cbe3532c2cd84303a2073cedad6b8bcad13be3 (diff) | |
| download | linux-a5f66725c7748a6831005a091b4aa9d18abb3b03.tar.bz2 | |
Merge branch 'misc' into k.o/for-next
Diffstat (limited to 'drivers/infiniband/hw/qib')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_driver.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_mad.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c index 2b5982f743ef..719906a9fd51 100644 --- a/drivers/infiniband/hw/qib/qib_driver.c +++ b/drivers/infiniband/hw/qib/qib_driver.c @@ -66,7 +66,6 @@ MODULE_PARM_DESC(compat_ddr_negotiate, MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Intel <ibsupport@intel.com>"); MODULE_DESCRIPTION("Intel IB driver"); -MODULE_VERSION(QIB_DRIVER_VERSION); /* * QIB_PIO_MAXIBHDR is the max IB header size allowed for in our 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; |