commit cb585bccfedab0c228344ffa258950c417dea6b5
author Luis Carlos Cobo <luisca@cozybit.com> Mon Mar 31 15:21:23 2008 -0700
committer John W. Linville <linville@tuxdriver.com> Tue Apr 01 17:14:11 2008 -0400
tree 96d00d7c5d57ed40d4f0e910e2e649f6b558f533
parent 73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27

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>

net/mac80211/ieee80211_sta.c

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index b836948..152682d 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -3079,7 +3079,7 @@
 		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);
 		}

net/mac80211/sta_info.c

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index f5c65e8..7e1e872 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -454,7 +454,7 @@
 	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;

net/mac80211/sta_info.h

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index b09861e..ebb7b2b 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -347,6 +347,7 @@
  * 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);