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

Commit bd381934 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:
  RDMA/addr: Fix resolution of local IPv6 addresses
  RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port()
  mlx4_core: Add 40GigE device ID
  RDMA/iwcm: Don't call provider reject func with irqs disabled
  IB: Fix typo in udev rule documentation
parents cc9b0b9b 335f2d1b

Documentation/infiniband/user_mad.txt

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ Setting IsSM Capability Bit 
  To create the appropriate character device files automatically with

  udev, a rule like



    KERNEL="umad*", NAME="infiniband/%k"

    KERNEL="issm*", NAME="infiniband/%k"

    KERNEL=="umad*", NAME="infiniband/%k"

    KERNEL=="issm*", NAME="infiniband/%k"



  can be used.  This will create device nodes named

Documentation/infiniband/user_verbs.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ Memory pinning 
  To create the appropriate character device files automatically with

  udev, a rule like



    KERNEL="uverbs*", NAME="infiniband/%k"

    KERNEL=="uverbs*", NAME="infiniband/%k"



  can be used.  This will create device nodes named

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int addr_resolve_local(struct sockaddr *src_in, 


		for_each_netdev(&init_net, dev)

			if (ipv6_chk_addr(&init_net,

					  &((struct sockaddr_in6 *) addr)->sin6_addr,

					  &((struct sockaddr_in6 *) dst_in)->sin6_addr,

					  dev, 1))

				break;

drivers/infiniband/core/iwcm.c

+2 −0
Original line number Diff line number Diff line
@@ -362,7 +362,9 @@ static void destroy_cm_id(struct iw_cm_id *cm_id) 
		 * In either case, must tell the provider to reject.

		 */

		cm_id_priv->state = IW_CM_STATE_DESTROYING;

		spin_unlock_irqrestore(&cm_id_priv->lock, flags);

		cm_id->device->iwcm->reject(cm_id, NULL, 0);

		spin_lock_irqsave(&cm_id_priv->lock, flags);

		break;

	case IW_CM_STATE_CONN_SENT:

	case IW_CM_STATE_DESTROYING:

drivers/infiniband/hw/cxgb3/iwch_provider.c

+7 −4
Original line number Diff line number Diff line
@@ -1199,11 +1199,14 @@ static int iwch_query_port(struct ib_device *ibdev, 
		props->state = IB_PORT_DOWN;

	else {

		inetdev = in_dev_get(netdev);

		if (inetdev) {

			if (inetdev->ifa_list)

				props->state = IB_PORT_ACTIVE;

			else

				props->state = IB_PORT_INIT;

			in_dev_put(inetdev);

		} else

			props->state = IB_PORT_INIT;

	}



	props->port_cap_flags =