OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Luis Carlos Cobo 2008-03-31 15:21:23 -07:00 committed by John W. Linville
parent 73bb3e4a7a
commit cb585bccfe
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/ieee80211_sta.c
View File

@ -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);
}

2
net/mac80211/sta_info.c
View File

@ -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;

1
net/mac80211/sta_info.h
View File

@ -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);