diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-23 19:03:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-23 19:03:51 -0700 |
| commit | 74d154189d597b91da4322996dbf4f5c3d1544ab (patch) | |
| tree | 6f09861b5e2f875d2d8ea2127b16add9103221c6 /net/wireless/scan.c | |
| parent | 5a6338db37885af06760d40cad589316e48431e9 (diff) | |
| parent | ffafa60d496f80c250f2ae0340ae94434c0b0b4d (diff) | |
| download | linux-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.gz linux-74d154189d597b91da4322996dbf4f5c3d1544ab.tar.bz2 linux-74d154189d597b91da4322996dbf4f5c3d1544ab.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 4f552c3f29a3..decc59fe0ee8 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -48,8 +48,6 @@ void __cfg80211_scan_done(struct work_struct *wk) else nl80211_send_scan_done(wiphy_to_dev(request->wiphy), dev); - wiphy_to_dev(request->wiphy)->scan_req = NULL; - #ifdef CONFIG_WIRELESS_EXT if (!request->aborted) { memset(&wrqu, 0, sizeof(wrqu)); @@ -62,6 +60,7 @@ void __cfg80211_scan_done(struct work_struct *wk) out: cfg80211_unlock_rdev(rdev); + wiphy_to_dev(request->wiphy)->scan_req = NULL; kfree(request); } |