projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
wireless
/
hostap
/
hostap_ap.c
diff --git
a/drivers/net/wireless/hostap/hostap_ap.c
b/drivers/net/wireless/hostap/hostap_ap.c
index
d36e252
..
5965255
100644
(file)
--- a/
drivers/net/wireless/hostap/hostap_ap.c
+++ b/
drivers/net/wireless/hostap/hostap_ap.c
@@
-147,7
+147,7
@@
static void ap_free_sta(struct ap_data *ap, struct sta_info *sta)
if (!sta->ap && sta->u.sta.challenge)
kfree(sta->u.sta.challenge);
- del_timer(&sta->timer);
+ del_timer
_sync
(&sta->timer);
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
kfree(sta);