diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-02-17 07:54:08 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:06:06 -0500 |
commit | b55e75ed926ded110293b0d1e24eb6a878883115 (patch) | |
tree | 8d8d8661b7e8044e89677d4c7c2f6d92451239c5 /drivers/net/wireless/iwlwifi/iwl-debugfs.c | |
parent | 76c9cc18fd2c8cfa5a7f66d5496d469db00eaf54 (diff) |
iwlwifi: remove STATUS_MODE_PENDING
Since rfkill integration, mac80211 can no
longer add an interface while the hardware
is not ready, so STATUS_MODE_PENDING can
never be set.
Also, remove another superfluous channel
sanity check and return the commit_rxon
return value in case it failed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 7bf44f146799..fc084dd2d14e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
@@ -560,8 +560,6 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, | |||
560 | test_bit(STATUS_POWER_PMI, &priv->status)); | 560 | test_bit(STATUS_POWER_PMI, &priv->status)); |
561 | pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n", | 561 | pos += scnprintf(buf + pos, bufsz - pos, "STATUS_FW_ERROR:\t %d\n", |
562 | test_bit(STATUS_FW_ERROR, &priv->status)); | 562 | test_bit(STATUS_FW_ERROR, &priv->status)); |
563 | pos += scnprintf(buf + pos, bufsz - pos, "STATUS_MODE_PENDING:\t %d\n", | ||
564 | test_bit(STATUS_MODE_PENDING, &priv->status)); | ||
565 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); | 563 | return simple_read_from_buffer(user_buf, count, ppos, buf, pos); |
566 | } | 564 | } |
567 | 565 | ||