diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-25 20:51:42 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 20:51:42 +0200 |
| commit | e569aa78ba01f7f66e016a4d57310fd041524d17 (patch) | |
| tree | eaedc03d42ee2bf6200fc07b080a99bad103def3 /drivers/net/wireless/hostap | |
| parent | mlx4_en: Fix build warning in mlx4_en_create_rx_ring. (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-e569aa78ba01f7f66e016a4d57310fd041524d17.tar.xz linux-e569aa78ba01f7f66e016a4d57310fd041524d17.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas/if_sdio.c
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index a85e43a8d758..6038633ef361 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c @@ -1696,7 +1696,7 @@ static int prism2_request_scan(struct net_device *dev) hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE, HFA384X_ROAMING_FIRMWARE); - return 0; + return ret; } #else /* !PRISM2_NO_STATION_MODES */ |