diff options
| author | Reinette Chatre <reinette.chatre@intel.com> | 2008-12-05 01:49:08 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-12-12 21:48:20 +0300 |
| commit | 447107fb32d75425c95a33f58e6b4b760b470092 (patch) | |
| tree | 83ae7e491ad2c56a9d29d69f38f30967fc2629b6 /net/mac80211/main.c | |
| parent | bb608e9db7d29616fb6e0d856c23434610d4a1bd (diff) | |
| download | linux-447107fb32d75425c95a33f58e6b4b760b470092.tar.xz | |
mac80211: remove WARN_ON() from ieee80211_hw_config
ieee80211_hw_config can return an error when the hardware
has rfkill enabled. A WARN_ON() is too harsh for this
failure as it is a valid scenario. Only comment this warning
as we would like to have it back when rfkill is integrated into
mac80211.
Also reintroduce propagation of error if ieee80211_hw_config fails
in ieee80211_config_beacon.
This patch partially reverts patch:
5f0387fc3337ca26f0745f945f550f0c3734960f
"mac80211: clean up ieee80211_hw_config errors"
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 29c3ecf7e914..df7e9a810b88 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -243,10 +243,20 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) if (changed && local->open_count) { ret = local->ops->config(local_to_hw(local), changed); /* + * Goal: * HW reconfiguration should never fail, the driver has told * us what it can support so it should live up to that promise. + * + * Current status: + * rfkill is not integrated with mac80211 and a + * configuration command can thus fail if hardware rfkill + * is enabled + * + * FIXME: integrate rfkill with mac80211 and then add this + * WARN_ON() back + * */ - WARN_ON(ret); + /* WARN_ON(ret); */ } return ret; |