diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wldev_common.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wldev_common.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/bcmdhd/wldev_common.c b/drivers/net/wireless/bcmdhd/wldev_common.c index d9a0b93d689..f83df791e13 100644 --- a/drivers/net/wireless/bcmdhd/wldev_common.c +++ b/drivers/net/wireless/bcmdhd/wldev_common.c @@ -1,9 +1,9 @@ /* * Common function shared by Linux WEXT, cfg80211 and p2p drivers * - * Copyright (C) 1999-2011, Broadcom Corporation + * Copyright (C) 1999-2012, Broadcom Corporation * - * Unless you and Broadcom execute a separate written software license + * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you * under the terms of the GNU General Public License version 2 (the "GPL"), * available at http://www.broadcom.com/licenses/GPLv2.php, with the @@ -53,6 +53,7 @@ s32 wldev_ioctl( s32 ret = 0; struct wl_ioctl ioc; + memset(&ioc, 0, sizeof(ioc)); ioc.cmd = cmd; ioc.buf = arg; @@ -60,6 +61,7 @@ s32 wldev_ioctl( ioc.set = set; ret = dhd_ioctl_entry_local(dev, &ioc, cmd); + return ret; } @@ -82,11 +84,10 @@ s32 wldev_iovar_getbuf( void *param, s32 paramlen, void *buf, s32 buflen, struct mutex* buf_sync) { s32 ret = 0; - s32 iovar_len = 0; if (buf_sync) { mutex_lock(buf_sync); } - iovar_len = wldev_mkiovar(iovar_name, param, paramlen, buf, buflen); + wldev_mkiovar(iovar_name, param, paramlen, buf, buflen); ret = wldev_ioctl(dev, WLC_GET_VAR, buf, buflen, FALSE); if (buf_sync) mutex_unlock(buf_sync); @@ -196,11 +197,11 @@ s32 wldev_iovar_getbuf_bsscfg( void *param, s32 paramlen, void *buf, s32 buflen, s32 bsscfg_idx, struct mutex* buf_sync) { s32 ret = 0; - s32 iovar_len = 0; if (buf_sync) { mutex_lock(buf_sync); } - iovar_len = wldev_mkiovar_bsscfg(iovar_name, param, paramlen, buf, buflen, bsscfg_idx); + + wldev_mkiovar_bsscfg(iovar_name, param, paramlen, buf, buflen, bsscfg_idx); ret = wldev_ioctl(dev, WLC_GET_VAR, buf, buflen, FALSE); if (buf_sync) { mutex_unlock(buf_sync); @@ -219,7 +220,6 @@ s32 wldev_iovar_setbuf_bsscfg( mutex_lock(buf_sync); } iovar_len = wldev_mkiovar_bsscfg(iovar_name, param, paramlen, buf, buflen, bsscfg_idx); - ret = wldev_ioctl(dev, WLC_SET_VAR, buf, iovar_len, TRUE); if (buf_sync) { mutex_unlock(buf_sync); |