2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 6895523779d0..03cfaecc3bb7 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -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->ifa_list)
-                        props->state = IB_PORT_ACTIVE;
-                else
+                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;
-                in_dev_put(inetdev);
         }
 
         props->port_cap_flags =
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 3dd481e77f92..5dd7225b178e 100644
--- a/drivers/net/mlx4/main.c
+++ b/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, }
 };