summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelmut Schaa2010-12-27 15:07:16 +0100
committerJohn W. Linville2011-01-04 20:35:15 +0100
commit48103d25c4ca00a1d0692895f9aa68fcac6bc6af (patch)
tree09f5c430829610f39e9d47267f73ea9a19d62e47
parentrt2x00: Simplify intf->delayed_flags locking (diff)
downloadkernel-qcow2-linux-48103d25c4ca00a1d0692895f9aa68fcac6bc6af.tar.gz
kernel-qcow2-linux-48103d25c4ca00a1d0692895f9aa68fcac6bc6af.tar.xz
kernel-qcow2-linux-48103d25c4ca00a1d0692895f9aa68fcac6bc6af.zip
rt2x00: Remove unused interface spinlock
Since the last user of intf->lock is gone we can safely remove it. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h6
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c1
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index b3f77d4f37ff..84aaf393da43 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -358,12 +358,6 @@ enum rt2x00_delayed_flags {
*/
struct rt2x00_intf {
/*
- * All fields within the rt2x00_intf structure
- * must be protected with a spinlock.
- */
- spinlock_t lock;
-
- /*
* beacon->skb must be protected with the mutex.
*/
struct mutex beacon_skb_mutex;
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 297d972c229b..b5dad0427a97 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -268,7 +268,6 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
else
rt2x00dev->intf_sta_count++;
- spin_lock_init(&intf->lock);
spin_lock_init(&intf->seqlock);
mutex_init(&intf->beacon_skb_mutex);
intf->beacon = entry;