diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-03-04 15:26:15 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-03-13 16:02:31 -0400 |
| commit | d9357136ac4729f589543afb6b1d17d443ae4f71 (patch) | |
| tree | 00d7e5966faec86f820713136b196821b5e622bd /net/mac80211/ieee80211.c | |
| parent | 7524d7d6de5d5d3f081de8cf5479819fad339661 (diff) | |
the scheduled rc80211-simple.c removal
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211.c')
| -rw-r--r-- | net/mac80211/ieee80211.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 484b063a353..55b63712e48 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -1803,13 +1803,9 @@ static int __init ieee80211_init(void) BUILD_BUG_ON(sizeof(struct ieee80211_tx_packet_data) > sizeof(skb->cb)); - ret = rc80211_simple_init(); - if (ret) - goto out; - ret = rc80211_pid_init(); if (ret) - goto out_cleanup_simple; + goto out; ret = ieee80211_wme_register(); if (ret) { @@ -1824,15 +1820,12 @@ static int __init ieee80211_init(void) out_cleanup_pid: rc80211_pid_exit(); - out_cleanup_simple: - rc80211_simple_exit(); out: return ret; } static void __exit ieee80211_exit(void) { - rc80211_simple_exit(); rc80211_pid_exit(); if (mesh_allocated) |