[PATCH] d80211: trivial cleanups in ieee80211_i.h

[PATCH] d80211: trivial cleanups in ieee80211_i.h

[Michael Wu]

[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]

d80211: trivial cleanups in ieee80211_i.h

This removes some unused things and fixes a typo.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
---

 net/d80211/ieee80211.c   |    1 -
 net/d80211/ieee80211_i.h |    5 +----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/net/d80211/ieee80211.c b/net/d80211/ieee80211.c
index 82daeb8..bbcefa9 100644
--- a/net/d80211/ieee80211.c
+++ b/net/d80211/ieee80211.c
@@ -4559,7 +4559,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(
 	spin_lock_init(&local->sub_if_lock);
 	INIT_LIST_HEAD(&local->sub_if_list);
 
-        spin_lock_init(&local->generic_lock);
 	INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work);
 	init_timer(&local->stat_timer);
 	local->stat_timer.function = ieee80211_stat_refresh;
diff --git a/net/d80211/ieee80211_i.h b/net/d80211/ieee80211_i.h
index 5ab9eb5..bb8fc83 100644
--- a/net/d80211/ieee80211_i.h
+++ b/net/d80211/ieee80211_i.h
@@ -350,7 +350,7 @@ struct ieee80211_local {
 	struct class_device class_dev;
 
 	enum {
-		IEEE80211_DEV_UNITIALIZED = 0,
+		IEEE80211_DEV_UNINITIALIZED = 0,
 		IEEE80211_DEV_REGISTERED,
 		IEEE80211_DEV_UNREGISTERED,
 	} reg_state;
@@ -368,7 +368,6 @@ struct ieee80211_local {
 		ieee80211_tx_status_msg = 2
 	} ieee80211_msg_enum;
 
-        spinlock_t generic_lock;
 	/* Station data structures */
 	struct kset sta_kset;
 	spinlock_t sta_lock; /* mutex for STA data structures */
@@ -479,8 +478,6 @@ struct ieee80211_local {
         u32 stat_time;
         struct timer_list stat_timer;
 
-        struct proc_dir_entry *proc, *proc_sta, *proc_iface;
-
 	struct work_struct sta_proc_add;
 
 	enum {

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] d80211: trivial cleanups in ieee80211_i.h

[Jiri Benc]

On Thu, 8 Feb 2007 18:13:24 -0500, Michael Wu wrote:
> This removes some unused things and fixes a typo.

Applied to my tree, thanks for the patch!

 Jiri

-- 
Jiri Benc
SUSE Labs