diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-12-19 16:35:08 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-12-19 16:35:14 +0100 |
commit | ca680888d5d0d03862ec311a83c6a1c7a1e00a01 (patch) | |
tree | bc2a1777f1d715f947fa77940ebce5c43029b37b /drivers/net/wireless/orinoco/scan.c | |
parent | 40dc11ffb35e8c4e8fa71092048e0f8de9db758c (diff) | |
parent | b0c3844d8af6b9f3f18f31e1b0502fbefa2166be (diff) | |
download | linux-ca680888d5d0d03862ec311a83c6a1c7a1e00a01.tar.bz2 |
Merge commit 'v2.6.37-rc6' into sched/core
Merge reason: Update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/wireless/orinoco/scan.c')
-rw-r--r-- | drivers/net/wireless/orinoco/scan.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c index 4300d9db7d8c..86cb54c842e7 100644 --- a/drivers/net/wireless/orinoco/scan.c +++ b/drivers/net/wireless/orinoco/scan.c @@ -229,3 +229,11 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv, priv->scan_request = NULL; } } + +void orinoco_scan_done(struct orinoco_private *priv, bool abort) +{ + if (priv->scan_request) { + cfg80211_scan_done(priv->scan_request, abort); + priv->scan_request = NULL; + } +} |