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

Commit 8be1a6d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files
  mlx4_core: Add VLAN tag field to WQE control segment struct
  RDMA/nes: CM connection setup/teardown rework
  IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG
  IPoIB/cm: Connected mode is no longer EXPERIMENTAL
  RDMA/ucm: BKL is not needed for ib_ucm_open()
  RDMA/ucma: BKL is not needed for ucma_open()
parents 852fef69 cc9969c9

drivers/infiniband/core/ucm.c

+8 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#include <linux/cdev.h>

#include <linux/idr.h>

#include <linux/mutex.h>

#include <linux/smp_lock.h>



#include <asm/uaccess.h>
@@ -1154,11 +1153,18 @@ static unsigned int ib_ucm_poll(struct file *filp, 
	return mask;

}



/*

 * ib_ucm_open() does not need the BKL:

 *

 *  - no global state is referred to;

 *  - there is no ioctl method to race against;

 *  - no further module initialization is required for open to work

 *    after the device is registered.

 */

static int ib_ucm_open(struct inode *inode, struct file *filp)

{

	struct ib_ucm_file *file;



	cycle_kernel_lock();

	file = kmalloc(sizeof(*file), GFP_KERNEL);

	if (!file)

		return -ENOMEM;

drivers/infiniband/core/ucma.c

+8 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/in.h>

#include <linux/in6.h>

#include <linux/miscdevice.h>

#include <linux/smp_lock.h>



#include <rdma/rdma_user_cm.h>

#include <rdma/ib_marshall.h>
@@ -1149,6 +1148,14 @@ static unsigned int ucma_poll(struct file *filp, struct poll_table_struct *wait) 
	return mask;

}



/*

 * ucma_open() does not need the BKL:

 *

 *  - no global state is referred to;

 *  - there is no ioctl method to race against;

 *  - no further module initialization is required for open to work

 *    after the device is registered.

 */

static int ucma_open(struct inode *inode, struct file *filp)

{

	struct ucma_file *file;
@@ -1157,7 +1164,6 @@ static int ucma_open(struct inode *inode, struct file *filp) 
	if (!file)

		return -ENOMEM;



	lock_kernel();

	INIT_LIST_HEAD(&file->event_list);

	INIT_LIST_HEAD(&file->ctx_list);

	init_waitqueue_head(&file->poll_wait);
@@ -1165,7 +1171,6 @@ static int ucma_open(struct inode *inode, struct file *filp) 


	filp->private_data = file;

	file->filp = filp;

	unlock_kernel();

	return 0;

}

drivers/infiniband/hw/mlx4/cq.c

+1 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.

 * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

drivers/infiniband/hw/mlx4/main.c

+1 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.

 * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

drivers/infiniband/hw/mlx4/mlx4_ib.h

+1 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2006, 2007 Cisco Systems.  All rights reserved.

 * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU