diff options
author | Eliad Peller <eliad@wizery.com> | 2010-11-24 05:53:16 -0500 |
---|---|---|
committer | Luciano Coelho <luciano.coelho@nokia.com> | 2010-12-02 09:17:11 -0500 |
commit | d60080ae06b98790036104f07fa897cfc151ce12 (patch) | |
tree | 940412af5144a5e1dbf713b73949feea3f07b2e2 /drivers/net/wireless/wl12xx/main.c | |
parent | 7cb2cea9f0f207f819db9823413fa263175b6230 (diff) |
wl1271: move wl12xx debugfs directory to under wiphy's debugfs
Use per-device debugfs path, so multiple devices won't collide.
in order to use wl->hw->wiphy->debugfsdir, we have to move the debugfs
creation from wl1271_debugfs_init() to wl1271_register_hw().
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c index b2432dab4b51..7fecefe8d3c1 100644 --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c | |||
@@ -2602,6 +2602,8 @@ int wl1271_register_hw(struct wl1271 *wl) | |||
2602 | 2602 | ||
2603 | wl->mac80211_registered = true; | 2603 | wl->mac80211_registered = true; |
2604 | 2604 | ||
2605 | wl1271_debugfs_init(wl); | ||
2606 | |||
2605 | register_netdevice_notifier(&wl1271_dev_notifier); | 2607 | register_netdevice_notifier(&wl1271_dev_notifier); |
2606 | 2608 | ||
2607 | wl1271_notice("loaded"); | 2609 | wl1271_notice("loaded"); |
@@ -2736,8 +2738,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) | |||
2736 | /* Apply default driver configuration. */ | 2738 | /* Apply default driver configuration. */ |
2737 | wl1271_conf_init(wl); | 2739 | wl1271_conf_init(wl); |
2738 | 2740 | ||
2739 | wl1271_debugfs_init(wl); | ||
2740 | |||
2741 | order = get_order(WL1271_AGGR_BUFFER_SIZE); | 2741 | order = get_order(WL1271_AGGR_BUFFER_SIZE); |
2742 | wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order); | 2742 | wl->aggr_buf = (u8 *)__get_free_pages(GFP_KERNEL, order); |
2743 | if (!wl->aggr_buf) { | 2743 | if (!wl->aggr_buf) { |