diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-01-22 16:49:20 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-01-22 16:49:57 +0700 |
| commit | 8a65ee9a2f9055ebc72e3a34206255129e3afb09 (patch) | |
| tree | 6cc78596a50734f52be0050972b2df36a5ea3be3 /net/mac80211 | |
| parent | eedcf0c3ff0ab70b3a3a2ae7d73dcf334ea3c34e (diff) | |
| parent | d4184347012fbe705671037a4a0e4c7021ea4329 (diff) | |
| download | kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.zip kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.tar.gz kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.tar.bz2 | |
Merge 3.0.60
Change-Id: I00b211aba537823b54ad68971ebb9032a6bf78f7
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 3ff633e..065a971 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -794,7 +794,7 @@ void sta_info_init(struct ieee80211_local *local) void sta_info_stop(struct ieee80211_local *local) { - del_timer(&local->sta_cleanup); + del_timer_sync(&local->sta_cleanup); sta_info_flush(local, NULL); } |