diff options
author | Luis Carlos Cobo <luisca@cozybit.com> | 2008-03-31 18:21:23 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-01 17:14:11 -0400 |
commit | cb585bccfedab0c228344ffa258950c417dea6b5 (patch) | |
tree | 96d00d7c5d57ed40d4f0e910e2e649f6b558f533 /net/mac80211/ieee80211_sta.c | |
parent | 73bb3e4a7a9f1b8d5f89c3991bd0c904ab0b8e27 (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>
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index b836948a0b40..152682d4bb1a 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) | |||
3079 | if (time_after(jiffies, sta->last_rx + exp_time)) { | 3079 | if (time_after(jiffies, sta->last_rx + exp_time)) { |
3080 | printk(KERN_DEBUG "%s: expiring inactive STA %s\n", | 3080 | printk(KERN_DEBUG "%s: expiring inactive STA %s\n", |
3081 | dev->name, print_mac(mac, sta->addr)); | 3081 | dev->name, print_mac(mac, sta->addr)); |
3082 | sta_info_unlink(&sta); | 3082 | __sta_info_unlink(&sta); |
3083 | if (sta) | 3083 | if (sta) |
3084 | list_add(&sta->list, &tmp_list); | 3084 | list_add(&sta->list, &tmp_list); |
3085 | } | 3085 | } |