diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-10 18:56:13 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-10 22:17:14 (GMT) |
| commit | da9ef9f42bb21b49afd6c63b3b6c05c41fedf3d0 (patch) | |
| tree | 744e31c99a69c4445d8b5aa64f035f0d23b5e216 | |
| parent | 681acf68db7c4291f463991f0a320b3213f1a502 (diff) | |
| download | linux-da9ef9f42bb21b49afd6c63b3b6c05c41fedf3d0.tar.xz | |
staging: vt6656: s_vGenerateTxParameter remove else from if statements
The function returns out at if statements so drop else.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 6113807..0d0a956 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -717,25 +717,20 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context, return vnt_rxtx_rts(tx_context, &tx_buffer->tx_head, byPktType, cbFrameSize, bNeedACK, wCurrentRate, need_mic); - } else { - if (need_mic) - *mic_hdr = &tx_buffer-> - tx_head.tx_cts.tx.mic.hdr; - - return vnt_rxtx_cts(tx_context, &tx_buffer->tx_head, - byPktType, cbFrameSize, bNeedACK, - wCurrentRate, need_mic); } - } else { + if (need_mic) - *mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr; + *mic_hdr = &tx_buffer->tx_head.tx_cts.tx.mic.hdr; - return vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, - byPktType, cbFrameSize, bNeedACK, - wCurrentRate, need_rts, need_mic); + return vnt_rxtx_cts(tx_context, &tx_buffer->tx_head, byPktType, + cbFrameSize, bNeedACK, wCurrentRate, need_mic); } - return 0; + if (need_mic) + *mic_hdr = &tx_buffer->tx_head.tx_ab.tx.mic.hdr; + + return vnt_rxtx_ab(tx_context, &tx_buffer->tx_head, byPktType, + cbFrameSize, bNeedACK, wCurrentRate, need_rts, need_mic); } static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context, |