Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acdc30b5 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'qib' into for-next

parents 30a6a62f 16933955 c050def0 b17e0969 f6d60848

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ config INFINIBAND_ADDR_TRANS 


source "drivers/infiniband/hw/mthca/Kconfig"

source "drivers/infiniband/hw/ipath/Kconfig"

source "drivers/infiniband/hw/qib/Kconfig"

source "drivers/infiniband/hw/ehca/Kconfig"

source "drivers/infiniband/hw/amso1100/Kconfig"

source "drivers/infiniband/hw/cxgb3/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_INFINIBAND)		+= core/

obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/

obj-$(CONFIG_INFINIBAND_IPATH)		+= hw/ipath/

obj-$(CONFIG_INFINIBAND_QIB)		+= hw/qib/

obj-$(CONFIG_INFINIBAND_EHCA)		+= hw/ehca/

obj-$(CONFIG_INFINIBAND_AMSO1100)	+= hw/amso1100/

obj-$(CONFIG_INFINIBAND_CXGB3)		+= hw/cxgb3/

drivers/infiniband/core/core_priv.h

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ 


#include <rdma/ib_verbs.h>



int  ib_device_register_sysfs(struct ib_device *device);

int  ib_device_register_sysfs(struct ib_device *device,

			      int (*port_callback)(struct ib_device *,

						   u8, struct kobject *));

void ib_device_unregister_sysfs(struct ib_device *device);



int  ib_sysfs_setup(void);

drivers/infiniband/core/device.c

+4 −2
Original line number Diff line number Diff line
@@ -267,7 +267,9 @@ static int read_port_table_lengths(struct ib_device *device) 
 * callback for each device that is added. @device must be allocated

 * with ib_alloc_device().

 */

int ib_register_device(struct ib_device *device)

int ib_register_device(struct ib_device *device,

		       int (*port_callback)(struct ib_device *,

					    u8, struct kobject *))

{

	int ret;
@@ -296,7 +298,7 @@ int ib_register_device(struct ib_device *device) 
		goto out;

	}



	ret = ib_device_register_sysfs(device);

	ret = ib_device_register_sysfs(device, port_callback);

	if (ret) {

		printk(KERN_WARNING "Couldn't register device %s with driver model\n",

		       device->name);

drivers/infiniband/core/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ MODULE_DESCRIPTION("kernel IB MAD API"); 
MODULE_AUTHOR("Hal Rosenstock");

MODULE_AUTHOR("Sean Hefty");



int mad_sendq_size = IB_MAD_QP_SEND_SIZE;

int mad_recvq_size = IB_MAD_QP_RECV_SIZE;

static int mad_sendq_size = IB_MAD_QP_SEND_SIZE;

static int mad_recvq_size = IB_MAD_QP_RECV_SIZE;



module_param_named(send_queue_size, mad_sendq_size, int, 0444);

MODULE_PARM_DESC(send_queue_size, "Size of send queue in number of work requests");