From: Vipin Mehta <vmehta@atheros.com>
To: kernel-janitors@vger.kernel.org
Subject: Re: [patch 1/2] staging: ath6kl: cleanup in SEND_FRAME ioctl
Date: Sun, 20 Feb 2011 15:18:34 +0000 [thread overview]
Message-ID: <20110220151834.GA5683@vmehta-desktop> (raw)
In-Reply-To: <20110220124832.GA1898@bicker>
On Sun, Feb 20, 2011 at 04:49:08AM -0800, Dan Carpenter wrote:
> The original code was written in a funny way where every statement was
> part of else if blocks. I broke them up into separate statements by
> adding breaks on failure conditions.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/drivers/staging/ath6kl/os/linux/ioctl.c b/drivers/staging/ath6kl/os/linux/ioctl.c
> index 5be8ea3..17ba543 100644
> --- a/drivers/staging/ath6kl/os/linux/ioctl.c
> +++ b/drivers/staging/ath6kl/os/linux/ioctl.c
> @@ -3140,29 +3140,31 @@ int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
>
> case AR6000_XIOCTL_OPT_SEND_FRAME:
> {
> - WMI_OPT_TX_FRAME_CMD optTxFrmCmd;
> + WMI_OPT_TX_FRAME_CMD optTxFrmCmd;
> u8 data[MAX_OPT_DATA_LEN];
>
> if (ar->arWmiReady = false) {
> ret = -EIO;
> - } else if (copy_from_user(&optTxFrmCmd, userdata,
> - sizeof(optTxFrmCmd)))
> - {
> + break;
> + }
> +
> + if (copy_from_user(&optTxFrmCmd, userdata, sizeof(optTxFrmCmd))) {
> ret = -EFAULT;
> - } else if (copy_from_user(data,
> - userdata+sizeof(WMI_OPT_TX_FRAME_CMD)-1,
> - optTxFrmCmd.optIEDataLen))
> - {
> + break;
> + }
> +
> + if (copy_from_user(data, userdata+sizeof(WMI_OPT_TX_FRAME_CMD) - 1,
> + optTxFrmCmd.optIEDataLen)) {
> ret = -EFAULT;
> - } else {
> - ret = wmi_opt_tx_frame_cmd(ar->arWmi,
> + break;
> + }
> +
> + ret = wmi_opt_tx_frame_cmd(ar->arWmi,
> optTxFrmCmd.frmType,
> optTxFrmCmd.dstAddr,
> optTxFrmCmd.bssid,
> optTxFrmCmd.optIEDataLen,
> data);
> - }
> -
> break;
> }
> case AR6000_XIOCTL_WMI_SETRETRYLIMITS:
The cleanup is applicable to the rest of the ar6000_ioctl as well.
Acked-by: Vipin Mehta <vipin.mehta@atheros.com>
next prev parent reply other threads:[~2011-02-20 15:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-20 12:49 [patch 1/2] staging: ath6kl: cleanup in SEND_FRAME ioctl Dan Carpenter
2011-02-20 15:18 ` Vipin Mehta [this message]
2011-02-21 4:00 ` Luis R. Rodriguez
2011-02-21 4:14 ` Greg KH
2011-02-21 4:45 ` Luis R. Rodriguez
2011-02-21 5:02 ` Greg KH
2011-02-21 5:04 ` Luis R. Rodriguez
2011-02-22 16:42 ` Joe Perches
2011-02-22 17:36 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110220151834.GA5683@vmehta-desktop \
--to=vmehta@atheros.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.