Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts: drivers/net/wireless/libertas_tf/cmd.c drivers/net/wireless/libertas_tf/main.c
This commit is contained in:
@ -2117,10 +2117,6 @@ EXPORT_SYMBOL(iwl_mac_remove_interface);
|
||||
|
||||
/**
|
||||
* iwl_mac_config - mac80211 config callback
|
||||
*
|
||||
* We ignore conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME since it seems to
|
||||
* be set inappropriately and the driver currently sets the hardware up to
|
||||
* use it whenever needed.
|
||||
*/
|
||||
int iwl_mac_config(struct ieee80211_hw *hw, u32 changed)
|
||||
{
|
||||
@ -2935,6 +2931,12 @@ int iwl_pci_resume(struct pci_dev *pdev)
|
||||
struct iwl_priv *priv = pci_get_drvdata(pdev);
|
||||
int ret;
|
||||
|
||||
/*
|
||||
* We disable the RETRY_TIMEOUT register (0x41) to keep
|
||||
* PCI Tx retries from interfering with C3 CPU state.
|
||||
*/
|
||||
pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
|
||||
|
||||
pci_set_power_state(pdev, PCI_D0);
|
||||
ret = pci_enable_device(pdev);
|
||||
if (ret)
|
||||
|
Reference in New Issue
Block a user