aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Carlos Cobo <luisca@cozybit.com>2008-03-31 15:21:23 -0700
committerJohn W. Linville <linville@tuxdriver.com>2008-04-01 17:14:11 -0400
commitcb585bccfedab0c228344ffa258950c417dea6b5 (patch)
tree96d00d7c5d57ed40d4f0e910e2e649f6b558f533
parent73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27 (diff)
mac80211: fix spinlock recursion on sta expiration
Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/mac80211/ieee80211_sta.c2
-rw-r--r--net/mac80211/sta_info.c2
-rw-r--r--net/mac80211/sta_info.h1
3 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index b836948a0b4..152682d4bb1 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -3079,7 +3079,7 @@ static void ieee80211_sta_expire(struct net_device *dev, unsigned long exp_time)
if (time_after(jiffies, sta->last_rx + exp_time)) {
printk(KERN_DEBUG "%s: expiring inactive STA %s\n",
dev->name, print_mac(mac, sta->addr));
- sta_info_unlink(&sta);
+ __sta_info_unlink(&sta);
if (sta)
list_add(&sta->list, &tmp_list);
}
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index f5c65e89128..7e1e8725764 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -454,7 +454,7 @@ static struct sta_info *__sta_info_unpin(struct sta_info *sta)
return ret;
}
-static void __sta_info_unlink(struct sta_info **sta)
+void __sta_info_unlink(struct sta_info **sta)
{
struct ieee80211_local *local = (*sta)->local;
struct ieee80211_sub_if_data *sdata = (*sta)->sdata;
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index b09861eb124..ebb7b2b4d0b 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -347,6 +347,7 @@ int sta_info_insert(struct sta_info *sta);
* has already unlinked it.
*/
void sta_info_unlink(struct sta_info **sta);
+void __sta_info_unlink(struct sta_info **sta);
void sta_info_destroy(struct sta_info *sta);
void sta_info_set_tim_bit(struct sta_info *sta);