From 8a2d7314eaa8ce7810160f34f139c6527d65a2a3 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Mon, 16 Jul 2012 14:25:56 +0000 Subject: [PATCH] --- yaml --- r: 315405 b: refs/heads/master c: efdfad3205403e1d1c5c0bdcbdb647ddd89bfaa3 h: refs/heads/master i: 315403: 9b0a8d79ea7c99f94fd228af97c36a0afcb4d984 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bnx2.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 430b4b6a837d..9efa30c00e83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aed93e0bf493535c25c27270001226bb1dd379b2 +refs/heads/master: efdfad3205403e1d1c5c0bdcbdb647ddd89bfaa3 diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c index 0ced154129a9..79cebd8525ce 100644 --- a/trunk/drivers/net/ethernet/broadcom/bnx2.c +++ b/trunk/drivers/net/ethernet/broadcom/bnx2.c @@ -6388,6 +6388,7 @@ bnx2_reset_task(struct work_struct *work) { struct bnx2 *bp = container_of(work, struct bnx2, reset_task); int rc; + u16 pcicmd; rtnl_lock(); if (!netif_running(bp->dev)) { @@ -6397,6 +6398,12 @@ bnx2_reset_task(struct work_struct *work) bnx2_netif_stop(bp, true); + pci_read_config_word(bp->pdev, PCI_COMMAND, &pcicmd); + if (!(pcicmd & PCI_COMMAND_MEMORY)) { + /* in case PCI block has reset */ + pci_restore_state(bp->pdev); + pci_save_state(bp->pdev); + } rc = bnx2_init_nic(bp, 1); if (rc) { netdev_err(bp->dev, "failed to reset NIC, closing\n");