diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-06-25 21:17:58 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-25 21:17:58 +0200 |
| commit | 1839cea91e5629756dd4f87c5d70d8a18b89c0b4 (patch) | |
| tree | 88c6788cab32303570c7558dda5cbf40ed26bfb3 /net/mac80211/wext.c | |
| parent | bnx2x: Update version (diff) | |
| parent | wext: Emit event stream entries correctly when compat. (diff) | |
| download | linux-1839cea91e5629756dd4f87c5d70d8a18b89c0b4.tar.xz linux-1839cea91e5629756dd4f87c5d70d8a18b89c0b4.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/wireless-2.6
Diffstat (limited to 'net/mac80211/wext.c')
| -rw-r--r-- | net/mac80211/wext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 5af3862e7191..f47d13bdf7f7 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c @@ -567,7 +567,7 @@ static int ieee80211_ioctl_giwscan(struct net_device *dev, if (local->sta_sw_scanning || local->sta_hw_scanning) return -EAGAIN; - res = ieee80211_sta_scan_results(dev, extra, data->length); + res = ieee80211_sta_scan_results(dev, info, extra, data->length); if (res >= 0) { data->length = res; return 0; |