diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-07 15:07:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-08 16:35:50 -0400 |
| commit | 3473187d2459a078e00e5fac8aafc30af69c57fa (patch) | |
| tree | 93c3da6dbcbfd09ea81884bee790219d4cee0d56 /net/mac80211/main.c | |
| parent | 73e194639d90594d06d0c10019c0ab4638869135 (diff) | |
mac80211: remove wep dependency
The current mac80211 code assumes that WEP is always available. If WEP
fails to initialize, ieee80211_register_hw will always fail.
In some cases (e.g. FIPS certification), the cryptography used by WEP is
unavailable. However, in such cases there is no good reason why CCMP
encryption (or even no link level encryption) cannot be used. So, this
patch removes mac80211's assumption that WEP (and TKIP) will always be
available for use.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index edf7aff9326..0e95c750ded 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -637,11 +637,9 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) goto fail_sta_info; result = ieee80211_wep_init(local); - if (result < 0) { + if (result < 0) printk(KERN_DEBUG "%s: Failed to initialize wep: %d\n", wiphy_name(local->hw.wiphy), result); - goto fail_wep; - } rtnl_lock(); @@ -694,7 +692,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) fail_rate: rtnl_unlock(); ieee80211_wep_free(local); - fail_wep: sta_info_stop(local); fail_sta_info: destroy_workqueue(local->workqueue); |