From efa22186ff773f61558a8b43002867fd9cef5bf6 Mon Sep 17 00:00:00 2001
From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date: Wed, 7 Oct 2009 15:46:49 -0700
Subject: [PATCH] --- yaml --- r: 167213 b: refs/heads/master c:
 e76d0b67d022fe70def07cfff3cdb36138b4c3f2 h: refs/heads/master i:   167211:
 ee0253f783c471d30d65f99f6eaed647bc4750e9 v: v3

---
 [refs]                                        | 2 +-
 trunk/Documentation/infiniband/user_mad.txt   | 4 ++--
 trunk/Documentation/infiniband/user_verbs.txt | 2 +-
 trunk/drivers/infiniband/core/addr.c          | 2 +-
 trunk/drivers/infiniband/core/iwcm.c          | 2 --
 trunk/drivers/net/mlx4/main.c                 | 1 +
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d631306dbf3b..98dd3c98a94c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85f20b39fd44310a163a9b33708fea57f08a4e40
+refs/heads/master: e76d0b67d022fe70def07cfff3cdb36138b4c3f2
diff --git a/trunk/Documentation/infiniband/user_mad.txt b/trunk/Documentation/infiniband/user_mad.txt
index 8a366959f5cc..744687dd195b 100644
--- a/trunk/Documentation/infiniband/user_mad.txt
+++ b/trunk/Documentation/infiniband/user_mad.txt
@@ -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
 
diff --git a/trunk/Documentation/infiniband/user_verbs.txt b/trunk/Documentation/infiniband/user_verbs.txt
index afe3f8da9018..f847501e50b5 100644
--- a/trunk/Documentation/infiniband/user_verbs.txt
+++ b/trunk/Documentation/infiniband/user_verbs.txt
@@ -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
 
diff --git a/trunk/drivers/infiniband/core/addr.c b/trunk/drivers/infiniband/core/addr.c
index bd07803e9183..5be1bd4fc7ed 100644
--- a/trunk/drivers/infiniband/core/addr.c
+++ b/trunk/drivers/infiniband/core/addr.c
@@ -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 *) dst_in)->sin6_addr,
+					  &((struct sockaddr_in6 *) addr)->sin6_addr,
 					  dev, 1))
 				break;
 
diff --git a/trunk/drivers/infiniband/core/iwcm.c b/trunk/drivers/infiniband/core/iwcm.c
index 625fec5a741c..55d093a36ae4 100644
--- a/trunk/drivers/infiniband/core/iwcm.c
+++ b/trunk/drivers/infiniband/core/iwcm.c
@@ -362,9 +362,7 @@ 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:
diff --git a/trunk/drivers/net/mlx4/main.c b/trunk/drivers/net/mlx4/main.c
index 3dd481e77f92..5dd7225b178e 100644
--- a/trunk/drivers/net/mlx4/main.c
+++ b/trunk/drivers/net/mlx4/main.c
@@ -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, }
 };