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

Commit 52824b6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mthca: make a function static
  IB/ipath: Fix whitespace
  IB/ipath: Make more names static
  IB/mad: Fix RMPP version check during agent registration
  IB/srp: Remove request from list when SCSI abort succeeds
parents 949b2112 415dcd95

drivers/infiniband/core/mad.c

+1 −4
Original line number Diff line number Diff line
@@ -228,10 +228,7 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, 
				goto error1;

		}

		/* Make sure class supplied is consistent with RMPP */

		if (ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {

			if (!rmpp_version)

				goto error1;

		} else {

		if (!ib_is_mad_class_rmpp(mad_reg_req->mgmt_class)) {

			if (rmpp_version)

				goto error1;

		}

drivers/infiniband/hw/ipath/ipath_diag.c

+0 −12
Original line number Diff line number Diff line
@@ -365,15 +365,3 @@ static ssize_t ipath_diag_write(struct file *fp, const char __user *data, 
bail:

	return ret;

}
 


void ipath_diag_bringup_link(struct ipath_devdata *dd)

{

	if (diag_set_link || (dd->ipath_flags & IPATH_LINKACTIVE))

		return;



	diag_set_link = 1;

	ipath_cdbg(VERBOSE, "Trying to set to set link active for "

		   "diag pkt\n");

	ipath_layer_set_linkstate(dd, IPATH_IB_LINKARM);

	ipath_layer_set_linkstate(dd, IPATH_IB_LINKACTIVE);

}

drivers/infiniband/hw/ipath/ipath_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -1729,7 +1729,7 @@ void ipath_free_pddata(struct ipath_devdata *dd, u32 port, int freehdrq) 
	}

}



int __init infinipath_init(void)

static int __init infinipath_init(void)

{

	int ret;

drivers/infiniband/hw/ipath/ipath_kernel.h

+0 −1
Original line number Diff line number Diff line
@@ -528,7 +528,6 @@ extern spinlock_t ipath_devs_lock; 
extern struct ipath_devdata *ipath_lookup(int unit);



extern u16 ipath_layer_rcv_opcode;

extern int ipath_verbs_registered;

extern int __ipath_layer_intr(struct ipath_devdata *, u32);

extern int ipath_layer_intr(struct ipath_devdata *, u32);

extern int __ipath_layer_rcv(struct ipath_devdata *, void *,

drivers/infiniband/hw/ipath/ipath_layer.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int (*layer_rcv)(void *, void *, struct sk_buff *); 
static int (*layer_rcv_lid)(void *, void *);

static int (*verbs_piobufavail)(void *);

static void (*verbs_rcv)(void *, void *, void *, u32);

int ipath_verbs_registered;

static int ipath_verbs_registered;



static void *(*layer_add_one)(int, struct ipath_devdata *);

static void (*layer_remove_one)(void *);