diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2009-08-20 21:36:16 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:25 -0400 |
| commit | 01a0ac417ce9b4f1216a266f2fd454cffefc5aee (patch) | |
| tree | 3bc13cf46eebc77a44e65b16132d26f71b131f50 /net/wireless/core.h | |
| parent | rndis_wlan: fix broken logic in add_wep_key() (diff) | |
| download | linux-dev-01a0ac417ce9b4f1216a266f2fd454cffefc5aee.tar.xz linux-dev-01a0ac417ce9b4f1216a266f2fd454cffefc5aee.zip | |
cfg80211: check lost scans later, fix bug
When we lose a scan, cfg80211 tries to clean up after
the driver. However, it currently does this too early,
it does this in GOING_DOWN already instead of DOWN, so
it may happen with mac80211. Besides fixing this, also
make it more robust by leaking the scan request so if
the driver later actually finishes the scan, it won't
crash. Also check in ___cfg80211_scan_done whether a
scan request is still pending and exit if not.
Reported-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Tested-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/core.h')
| -rw-r--r-- | net/wireless/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h index f565432ae22f..68eaf340d613 100644 --- a/net/wireless/core.h +++ b/net/wireless/core.h @@ -370,7 +370,7 @@ void cfg80211_sme_scan_done(struct net_device *dev); void cfg80211_sme_rx_auth(struct net_device *dev, const u8 *buf, size_t len); void cfg80211_sme_disassoc(struct net_device *dev, int idx); void __cfg80211_scan_done(struct work_struct *wk); -void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev); +void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool leak); void cfg80211_upload_connect_keys(struct wireless_dev *wdev); struct ieee80211_channel * |