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

Commit 335f2d1b authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cxgb3', 'misc' and 'mlx4' into for-next

parents e5da4ed8 85f20b39 e76d0b67

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/net/mlx4/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1282,6 +1282,7 @@ static struct pci_device_id mlx4_pci_table[] = { 
	{ PCI_VDEVICE(MELLANOX, 0x6372) }, /* MT25458 ConnectX EN 10GBASE-T 10GigE */

	{ PCI_VDEVICE(MELLANOX, 0x675a) }, /* MT25458 ConnectX EN 10GBASE-T+Gen2 10GigE */

	{ PCI_VDEVICE(MELLANOX, 0x6764) }, /* MT26468 ConnectX EN 10GigE PCIe gen2*/

	{ PCI_VDEVICE(MELLANOX, 0x676e) }, /* MT26478 ConnectX2 40GigE PCIe gen2 */

	{ 0, }

};