Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (9e865f58) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/bnx2.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -54,8 +54,8 @@

		#define DRV_MODULE_NAME "bnx2"
		#define PFX DRV_MODULE_NAME ": "
		#define DRV_MODULE_VERSION "1.6.3"
		#define DRV_MODULE_RELDATE "July 16, 2007"
		#define DRV_MODULE_VERSION "1.6.4"
		#define DRV_MODULE_RELDATE "August 3, 2007"

		#define RUN_AT(x) (jiffies + (x))

		@@ -6937,6 +6937,11 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
		struct bnx2 *bp = netdev_priv(dev);
		u32 reset_code;

		/* PCI register 4 needs to be saved whether netif_running() or not.
		* MSI address and data need to be saved if using MSI and
		* netif_running().
		*/
		pci_save_state(pdev);
		if (!netif_running(dev))
		return 0;

		@@ -6952,7 +6957,6 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
		reset_code = BNX2_DRV_MSG_CODE_SUSPEND_NO_WOL;
		bnx2_reset_chip(bp, reset_code);
		bnx2_free_skbs(bp);
		pci_save_state(pdev);
		bnx2_set_power_state(bp, pci_choose_state(pdev, state));
		return 0;
		}
		@@ -6963,10 +6967,10 @@ bnx2_resume(struct pci_dev *pdev)
		struct net_device *dev = pci_get_drvdata(pdev);
		struct bnx2 *bp = netdev_priv(dev);

		pci_restore_state(pdev);
		if (!netif_running(dev))
		return 0;

		pci_restore_state(pdev);
		bnx2_set_power_state(bp, PCI_D0);
		netif_device_attach(dev);
		bnx2_init_nic(bp);

+10 −7

Original line number	Diff line number	Diff line
		@@ -64,8 +64,8 @@

		#define DRV_MODULE_NAME "tg3"
		#define PFX DRV_MODULE_NAME ": "
		#define DRV_MODULE_VERSION "3.79"
		#define DRV_MODULE_RELDATE "July 18, 2007"
		#define DRV_MODULE_VERSION "3.80"
		#define DRV_MODULE_RELDATE "August 2, 2007"

		#define TG3_DEF_MAC_MODE 0
		#define TG3_DEF_RX_MODE 0
		@@ -12111,6 +12111,12 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
		struct tg3 *tp = netdev_priv(dev);
		int err;

		/* PCI register 4 needs to be saved whether netif_running() or not.
		* MSI address and data need to be saved if using MSI and
		* netif_running().
		*/
		pci_save_state(pdev);

		if (!netif_running(dev))
		return 0;

		@@ -12130,9 +12136,6 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state)
		tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
		tg3_full_unlock(tp);

		/* Save MSI address and data for resume. */
		pci_save_state(pdev);

		err = tg3_set_power_state(tp, pci_choose_state(pdev, state));
		if (err) {
		tg3_full_lock(tp, 0);
		@@ -12160,11 +12163,11 @@ static int tg3_resume(struct pci_dev *pdev)
		struct tg3 *tp = netdev_priv(dev);
		int err;

		pci_restore_state(tp->pdev);

		if (!netif_running(dev))
		return 0;

		pci_restore_state(tp->pdev);

		err = tg3_set_power_state(tp, PCI_D0);
		if (err)
		return err;

+1 −0