| From | Raphaël Beamonte <> | Subject | [PATCHv3 12/15] staging: rtl8192u: r8192U_core: rtl8192_tx: replace some inline conditions | Date | Sun, 20 Sep 2015 13:14:24 -0400 |
| |
Replace some inline conditions by a full if-else statement to make the source clearer and follow the 80 characters kernel code style rule.
Signed-off-by: Raphaël Beamonte <raphael.beamonte@gmail.com> --- drivers/staging/rtl8192u/r8192U_core.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index b3cedec..7dc1b34 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -1546,12 +1546,18 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) tx_fwinfo->RtsEnable = (tcb_desc->bRTSEnable) ? 1 : 0; tx_fwinfo->CtsEnable = (tcb_desc->bCTSEnable) ? 1 : 0; tx_fwinfo->RtsSTBC = (tcb_desc->bRTSSTBC) ? 1 : 0; - tx_fwinfo->RtsHT = (tcb_desc->rts_rate & 0x80) ? 1 : 0; tx_fwinfo->RtsRate = MRateToHwRate8190Pci((u8)tcb_desc->rts_rate); - tx_fwinfo->RtsSubcarrier = (tx_fwinfo->RtsHT == 0) ? (tcb_desc->RTSSC) : 0; - tx_fwinfo->RtsBandwidth = (tx_fwinfo->RtsHT == 1) ? ((tcb_desc->bRTSBW) ? 1 : 0) : 0; - tx_fwinfo->RtsShort = (tx_fwinfo->RtsHT == 0) ? (tcb_desc->bRTSUseShortPreamble ? 1 : 0) : - (tcb_desc->bRTSUseShortGI ? 1 : 0); + if (tcb_desc->rts_rate & 0x80) { + tx_fwinfo->RtsHT = 1; + tx_fwinfo->RtsSubcarrier = 0; + tx_fwinfo->RtsBandwidth = (tcb_desc->bRTSBW) ? 1 : 0; + tx_fwinfo->RtsShort = (tcb_desc->bRTSUseShortGI ? 1 : 0); + } else { + tx_fwinfo->RtsHT = 0; + tx_fwinfo->RtsSubcarrier = tcb_desc->RTSSC; + tx_fwinfo->RtsBandwidth = 0; + tx_fwinfo->RtsShort = (tcb_desc->bRTSUseShortPreamble ? 1 : 0); + } /* Set Bandwidth and sub-channel settings. */ if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) { -- 2.5.1
|