diff options
| author |   Matej Dujava <mdujava@kocurkovo.cz> | 2020-05-03 17:42:50 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-05 12:33:00 +0200 |
| commit | 0729bb9b2a97a279c4b7c7be8565d494aab3d6e9 (patch) | |
| tree | 10284bdd7c88c1b4401014d333c0eb1e8eff2b22 /drivers/staging/vt6655 | |
| parent | staging: vt6655: return early if not bNeedAck (diff) | |
| download | linux-dev-0729bb9b2a97a279c4b7c7be8565d494aab3d6e9.tar.xz linux-dev-0729bb9b2a97a279c4b7c7be8565d494aab3d6e9.zip | |
staging: vt6655: fix LONG_LINE warning
This patch will fix LONG_LINE error from checkpatch, by using ternary
operator.
Signed-off-by: Matej Dujava <mdujava@kocurkovo.cz>
Link: https://lore.kernel.org/r/1588520570-14388-3-git-send-email-mdujava@kocurkovo.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/rxtx.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index afecebe286a4..cfab64d2b312 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -170,10 +170,14 @@ s_uGetTxRsvTime( if (!bNeedAck) return uDataTime; - if (byPktType == PK_TYPE_11B) /* llb,CCK mode */ - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopCCKBasicRate); - else /* 11g 2.4G OFDM mode & 11a 5G OFDM mode */ - uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, (unsigned short)pDevice->byTopOFDMBasicRate); + /* + * CCK mode - 11b + * OFDM mode - 11g 2.4G & 11a 5G + */ + uAckTime = bb_get_frame_time(pDevice->byPreambleType, byPktType, 14, + byPktType == PK_TYPE_11B ? + pDevice->byTopCCKBasicRate : + pDevice->byTopOFDMBasicRate); return uDataTime + pDevice->uSIFS + uAckTime; } |