please pull infiniband.git
Linus, please pull from
master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This tree is also available from kernel.org mirrors at:
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git for-linus
This will get a few post-2.6.25-rc2 fixes, mostly for the new nes driver:
Chien Tung (1):
RDMA/nes: Fix VLAN support
Glenn Streiff (1):
RDMA/nes: Fix MAC interrupt erroneously masked on ifdown
Li Zefan (1):
IB: Fix return value in ib_device_register_sysfs()
Roland Dreier (1):
RDMA/nes: Fix possible array overrun
drivers/infiniband/core/sysfs.c | 4 ++- drivers/infiniband/hw/nes/nes_nic.c | 62 +++++++++++++++++++++++--------- drivers/infiniband/hw/nes/nes_verbs.c | 2 +- 3 files changed, 48 insertions(+), 20 deletions(-)
drivers/infiniband/core/sysfs.c +3 -1
@@ -686,8 +686,10 @@ int ib_device_register_sysfs(struct ib_device *device) device->ports_parent =kobject_create_and_add ("ports" ,kobject_get (&class_dev->kobj)); -if (!device->ports_parent) +if (!device->ports_parent) { + ret = -ENOMEM ; goto err_put; + }if (device->node_type ==RDMA_NODE_IB_SWITCH ) { ret =add_port (device,0 );
drivers/infiniband/hw/nes/nes_nic.c +44 -18
142 lines not on this page · raw message
drivers/infiniband/hw/nes/nes_verbs.c +1 -1
@@ -1337,7 +1337,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd, NES_MAX_USER_WQ_REGIONS, nes_ucontext->first_free_wq);/* nes_debug(NES_DBG_QP, "find_first_zero_biton wqs returned %u\n", nespd->mmap_db_index); */ -if (nesqp->mmap_sq_db_index >NES_MAX_USER_WQ_REGIONS ) { +if (nesqp->mmap_sq_db_index >=NES_MAX_USER_WQ_REGIONS ) {nes_debug (NES_DBG_QP ,"db index > max user regions, failing create QP\n" );nes_free_resource (nesadapter, nesadapter->allocated_qps, qp_num);