---

yaml --- r: 166043 b: refs/heads/master c: bdf6438 h: refs/heads/master i: 166041: c6048b9 166039: d23008e v: v3
git-mirror · Sep 24, 2009 · 14a4c26 · 14a4c26
1 parent 9ea9596
commit 14a4c26
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d686159e50c57788001001e9537aa8b4bbc38001
+refs/heads/master: bdf643816a2017eba9af280b6d29ef4213358984
diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_catas.c b/trunk/drivers/infiniband/hw/mthca/mthca_catas.c
@@ -68,16 +68,11 @@ 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)
-			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");
-		}
+			mthca_err(dev, "Reset failed (%d)\n", ret);
+		else
+			mthca_dbg(dev, "Reset succeeded\n");
 	}
 
 	mutex_unlock(&mthca_device_mutex);

diff --git a/trunk/drivers/infiniband/hw/nes/nes_nic.c b/trunk/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,
 };