lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
David S. Miller
2008-03-27 18:00:00 -07:00
parent 50fd4407b8 9896322ae1
commit 349fb2d649
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-4965.c
View File

@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
if (sta_ht_inf) { if (sta_ht_inf) {
if ((!sta_ht_inf->ht_supported) || if ((!sta_ht_inf->ht_supported) ||
(!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)) (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
return 0; return 0;
} }

2
drivers/net/wireless/libertas/if_cs.c
View File

@@ -677,9 +677,7 @@ sbi_get_int_status_exit:
/* Card has a command result for us */ /* Card has a command result for us */
if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) { if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
spin_lock(&priv->driver_lock);
ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len); ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
spin_unlock(&priv->driver_lock);
if (ret < 0) if (ret < 0)
lbs_pr_err("could not receive cmd from card\n"); lbs_pr_err("could not receive cmd from card\n");
} }

13
drivers/net/wireless/rt2x00/rt2x00dev.c
View File

@@ -1393,11 +1393,20 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
exit: exit:
/* /*
* Set device mode to sleep for power management. * Set device mode to sleep for power management,
* on some hardware this call seems to consistently fail.
* From the specifications it is hard to tell why it fails,
* and if this is a "bad thing".
* Overall it is safe to just ignore the failure and
* continue suspending. The only downside is that the
* device will not be in optimal power save mode, but with
* the radio and the other components already disabled the
* device is as good as disabled.
*/ */
retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP); retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP);
if (retval) if (retval)
return retval; WARNING(rt2x00dev, "Device failed to enter sleep state, "
"continue suspending.\n");
return 0; return 0;
} }