Commit da9ef9f4 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: s_vGenerateTxParameter remove else from if statements



The function returns out at if statements so drop else.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 681acf68
Loading
Loading
Loading
Loading
+9 −14
Original line number Diff line number Diff line
@@ -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;
			*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);
		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;

		return vnt_rxtx_ab(tx_context, &tx_buffer->tx_head,
					byPktType, cbFrameSize, bNeedACK,
					wCurrentRate, need_rts, need_mic);
	}

	return 0;
	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,