Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12402b5b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 7b5e56f9 c4e061ac

drivers/net/wireless/iwlwifi/iwl-agn.c

+2 −0
Original line number Diff line number Diff line
@@ -4042,6 +4042,7 @@ static int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state) 
		priv->is_open = 1;

	}



	pci_save_state(pdev);

	pci_set_power_state(pdev, PCI_D3hot);



	return 0;
@@ -4052,6 +4053,7 @@ static int iwl_pci_resume(struct pci_dev *pdev) 
	struct iwl_priv *priv = pci_get_drvdata(pdev);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	if (priv->is_open)

		iwl_mac_start(priv->hw);

drivers/net/wireless/iwlwifi/iwl-sta.c

+3 −0
Original line number Diff line number Diff line
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv) 
	priv->num_stations = 0;

	memset(priv->stations, 0, sizeof(priv->stations));



	/* clean ucode key table bit map */

	priv->ucode_key_table = 0;



	spin_unlock_irqrestore(&priv->sta_lock, flags);

}

EXPORT_SYMBOL(iwl_clear_stations_table);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −0
Original line number Diff line number Diff line
@@ -8143,6 +8143,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state) 
		priv->is_open = 1;

	}



	pci_save_state(pdev);

	pci_set_power_state(pdev, PCI_D3hot);



	return 0;
@@ -8153,6 +8154,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev) 
	struct iwl3945_priv *priv = pci_get_drvdata(pdev);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	if (priv->is_open)

		iwl3945_mac_start(priv->hw);