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:
  IPoIB: Don't turn on carrier for a non-active port
  IB/mthca: Fix access to freed memory in catastrophic event handling
  mlx4_core: Pass cache line size to device FW
  RDMA/nes: Remove duplicate .ndo_set_mac_address field initialization
  IB/mad: Fix lock-lock-timer deadlock in RMPP code

2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_catas.c b/drivers/infiniband/hw/mthca/mthca_catas.c
index 056b2a4c6970..0aa0110e4b6c 100644
--- a/drivers/infiniband/hw/mthca/mthca_catas.c
+++ b/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -68,11 +68,16 @@ static void catas_reset(struct work_struct *work)
         spin_unlock_irq(&catas_lock);
 
         list_for_each_entry_safe(dev, tmpdev, &tlist, catas_err.list) {
+                struct pci_dev *pdev = dev->pdev;
                 ret = __mthca_restart_one(dev->pdev);
+                /* 'dev' now is not valid */
                 if (ret)
-                        mthca_err(dev, "Reset failed (%d)\n", ret);
-                else
-                        mthca_dbg(dev, "Reset succeeded\n");
+                        printk(KERN_ERR "mthca %s: Reset failed (%d)\n",
+                               pci_name(pdev), ret);
+                else {
+                        struct mthca_dev *d = pci_get_drvdata(pdev);
+                        mthca_dbg(d, "Reset succeeded\n");
+                }
         }
 
         mutex_unlock(&mthca_device_mutex);
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 538e409d4515..e593af3354b8 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1566,7 +1566,6 @@ static const struct net_device_ops nes_netdev_ops = {
         .ndo_set_mac_address    = nes_netdev_set_mac_address,
         .ndo_set_multicast_list = nes_netdev_set_multicast_list,
         .ndo_change_mtu         = nes_netdev_change_mtu,
-        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_validate_addr      = eth_validate_addr,
         .ndo_vlan_rx_register   = nes_netdev_vlan_rx_register,
 };